commit: c8570bc0e2618e502c2fdab7ff972786a12899e0 Author: Raul E Rangel <rrangel <AT> chromium <DOT> org> AuthorDate: Mon Apr 23 16:15:59 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat May 5 20:15:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8570bc0
meson.eclass: Don't mix host *FLAGS with build *FLAGS meson gets the build flags from the environment. When cross compiling it will get the host flags from the cross file. The ebuild was not passing the correct build flags when cross compiling. By using tc-env_build the build environment flags are set when calling meson. This results in not mixing host and build flags: Example output: Native C compiler: x86_64-pc-linux-gnu-clang (clang 7.0) Appending CFLAGS from environment: '-O1 -pipe' Appending LDFLAGS from environment: ' ' Appending CPPFLAGS from environment: ' ' Cross C compiler: armv7a-cros-linux-gnueabi-clang (clang 7.0) Host machine cpu family: arm Host machine cpu: armv7a Target machine cpu family: arm Target machine cpu: armv7a Build machine cpu family: x86_64 Build machine cpu: x86_64 tc-env_build does not seem to load the actual build flags, but it's better than using host flags as build flags. See https://bugs.gentoo.org/653902 for upstream patch BUG=b:78351764 BRANCH=none TEST=emerge-grunt and verified mosys runs Change-Id: I802b58cb089b27b9253a034ac00dd183e0f1955a Signed-off-by: Raul E Rangel <rrangel <AT> chromium.org> Closes: https://bugs.gentoo.org/653902 eclass/meson.eclass | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 057339dffa4..f493bab2d01 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -159,11 +159,11 @@ _meson_create_cross_file() { cat > "${T}/meson.${CHOST}" <<-EOF [binaries] - ar = '${AR}' - c = '${CC}' - cpp = '${CXX}' - pkgconfig = '${PKG_CONFIG}' - strip = '${STRIP}' + ar = '$(tc-getAR)' + c = '$(tc-getCC)' + cpp = '$(tc-getCXX)' + pkgconfig = '$(tc-getPKG_CONFIG)' + strip = '$(tc-getSTRIP)' [properties] c_args = $(_meson_env_array "${CFLAGS}") @@ -211,24 +211,9 @@ meson_src_configure() { --wrap-mode nodownload ) - # Both meson(1) and _meson_create_cross_file need these - local -x AR=$(tc-getAR) - local -x CC=$(tc-getCC) - local -x CXX=$(tc-getCXX) - local -x PKG_CONFIG=$(tc-getPKG_CONFIG) - local -x STRIP=$(tc-getSTRIP) - if tc-is-cross-compiler; then _meson_create_cross_file || die "unable to write meson cross file" - mesonargs+=( - --cross-file "${T}/meson.${CHOST}" - ) - # In cross mode, meson uses these as the native/build programs - AR=$(tc-getBUILD_AR) - CC=$(tc-getBUILD_CC) - CXX=$(tc-getBUILD_CXX) - PKG_CONFIG=$(tc-getBUILD_PKG_CONFIG) - STRIP=$(tc-getBUILD_STRIP) + mesonargs+=( --cross-file "${T}/meson.${CHOST}" ) fi # https://bugs.gentoo.org/625396 @@ -241,7 +226,7 @@ meson_src_configure() { set -- meson "${mesonargs[@]}" "$@" \ "${EMESON_SOURCE:-${S}}" "${BUILD_DIR}" echo "$@" - "$@" || die + tc-env_build "$@" || die } # @FUNCTION: meson_src_compile
