diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-05-28 22:24:41 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-05-28 22:52:43 -0400 |
| commit | c804e6ec479119cd4f0d5ae0e0657c8384bba578 (patch) | |
| tree | 32234920813ccbbced2acb11e91f864a8eeffca6 /eclass | |
| parent | sys-libs/mtdev: Drop old versions (diff) | |
| download | gentoo-c804e6ec479119cd4f0d5ae0e0657c8384bba578.tar.gz gentoo-c804e6ec479119cd4f0d5ae0e0657c8384bba578.tar.bz2 gentoo-c804e6ec479119cd4f0d5ae0e0657c8384bba578.zip | |
meson.eclass: use a cross file for non-default ABIs
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/meson.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 576e9b428643..626fda861203 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 |