diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 10:47:13 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 10:47:13 +0100 |
| commit | 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (patch) | |
| tree | 401ffbc2ade49ce18f6182969ec5fb697a57ce48 /eclass/meson.eclass | |
| parent | d4bd6695641f6d2ec7ff8681913d304e995902f5 (diff) | |
gentoo resync : 02.06.2018
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 576e9b428643..f2202a04593d 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -157,12 +157,13 @@ _meson_create_cross_file() { # This may require adjustment based on CFLAGS local cpu=${CHOST%%-*} - cat > "${T}/meson.${CHOST}" <<-EOF + cat > "${T}/meson.${CHOST}.${ABI}" <<-EOF [binaries] ar = $(_meson_env_array "$(tc-getAR)") c = $(_meson_env_array "$(tc-getCC)") cpp = $(_meson_env_array "$(tc-getCXX)") fortran = $(_meson_env_array "$(tc-getFC)") + llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)' objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") pkgconfig = '$(tc-getPKG_CONFIG)' @@ -217,9 +218,9 @@ meson_src_configure() { --wrap-mode nodownload ) - if tc-is-cross-compiler; then + if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then _meson_create_cross_file || die "unable to write meson cross file" - mesonargs+=( --cross-file "${T}/meson.${CHOST}" ) + mesonargs+=( --cross-file "${T}/meson.${CHOST}.${ABI}" ) fi # https://bugs.gentoo.org/625396 |