tc-export_build_env: handle non-cross compile case

By handling the non-cross compiler case the meson.eclass can be
simplified to `tc-env_build "$@" || die`.

See https://bugs.gentoo.org/654424

Change-Id: I1a90da46366c490abbf7d5660bf90482c7f22747
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Closes: https://bugs.gentoo.org/654424

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 4b1876b8e09bf0a61a881b050e92308b6228e4ad..1c8090cf75c721a4b05b8ea711ea80794d88c3f3 100644 (file)
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -247,13 +247,21 @@ tc-stack-grows-down() {
 # Export common build related compiler settings.
 tc-export_build_env() {
        tc-export "$@"
-       # Some build envs will initialize vars like:
-       # : ${BUILD_LDFLAGS:-${LDFLAGS}}
-       # So make sure all variables are non-empty. #526734
-       : ${BUILD_CFLAGS:=-O1 -pipe}
-       : ${BUILD_CXXFLAGS:=-O1 -pipe}
-       : ${BUILD_CPPFLAGS:= }
-       : ${BUILD_LDFLAGS:= }
+       if tc-is-cross-compiler; then
+               # Some build envs will initialize vars like:
+               # : ${BUILD_LDFLAGS:-${LDFLAGS}}
+               # So make sure all variables are non-empty. #526734
+               : ${BUILD_CFLAGS:=-O1 -pipe}
+               : ${BUILD_CXXFLAGS:=-O1 -pipe}
+               : ${BUILD_CPPFLAGS:= }
+               : ${BUILD_LDFLAGS:= }
+       else
+               # https://bugs.gentoo.org/654424
+               : ${BUILD_CFLAGS:=${CFLAGS}}
+               : ${BUILD_CXXFLAGS:=${CXXFLAGS}}
+               : ${BUILD_CPPFLAGS:=${CPPFLAGS}}
+               : ${BUILD_LDFLAGS:=${LDFLAGS}}
+       fi
        export BUILD_{C,CXX,CPP,LD}FLAGS
 
        # Some packages use XXX_FOR_BUILD.