meson.eclass: use a cross file for non-default ABIs

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 576e9b428643bc885fa5d414b0646641c6c9d141..626fda861203e57f7eeabeaed9dd9e7fda3eb1ac 100644 (file)
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -157,7 +157,7 @@ _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)")
@@ -217,9 +217,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