[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     c804e6ec479119cd4f0d5ae0e0657c8384bba578
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 02:24:41 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 29 02:52:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c804e6ec

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

 eclass/meson.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 576e9b42864..626fda86120 100644
--- 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