summaryrefslogtreecommitdiff
path: root/eclass/meson.eclass
diff options
context:
space:
mode:
Diffstat (limited to 'eclass/meson.eclass')
-rw-r--r--eclass/meson.eclass7
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