diff options
| author |   Raul E Rangel <rrangel@chromium.org> | 2018-05-01 12:40:30 -0600 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2018-05-05 16:15:55 -0400 |
| commit | 2dd9b21e7b9003c1dd6e7e71578449d01302d610 (patch) | |
| tree | 9786799348e9e9ac531833249a788f4c0350a42b /eclass | |
| parent | dev-util/codeblocks: Shorten the elog about symbol resolver (diff) | |
| download | gentoo-2dd9b21e7b9003c1dd6e7e71578449d01302d610.tar.gz gentoo-2dd9b21e7b9003c1dd6e7e71578449d01302d610.tar.bz2 gentoo-2dd9b21e7b9003c1dd6e7e71578449d01302d610.zip | |
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
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 4b1876b8e09b..1c8090cf75c7 100644 --- 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. |