| 1 |
commit: c804e6ec479119cd4f0d5ae0e0657c8384bba578 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 29 02:24:41 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 02:52:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c804e6ec |
| 7 |
|
| 8 |
meson.eclass: use a cross file for non-default ABIs |
| 9 |
|
| 10 |
eclass/meson.eclass | 6 +++--- |
| 11 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 14 |
index 576e9b42864..626fda86120 100644 |
| 15 |
--- a/eclass/meson.eclass |
| 16 |
+++ b/eclass/meson.eclass |
| 17 |
@@ -157,7 +157,7 @@ _meson_create_cross_file() { |
| 18 |
# This may require adjustment based on CFLAGS |
| 19 |
local cpu=${CHOST%%-*} |
| 20 |
|
| 21 |
- cat > "${T}/meson.${CHOST}" <<-EOF |
| 22 |
+ cat > "${T}/meson.${CHOST}.${ABI}" <<-EOF |
| 23 |
[binaries] |
| 24 |
ar = $(_meson_env_array "$(tc-getAR)") |
| 25 |
c = $(_meson_env_array "$(tc-getCC)") |
| 26 |
@@ -217,9 +217,9 @@ meson_src_configure() { |
| 27 |
--wrap-mode nodownload |
| 28 |
) |
| 29 |
|
| 30 |
- if tc-is-cross-compiler; then |
| 31 |
+ if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then |
| 32 |
_meson_create_cross_file || die "unable to write meson cross file" |
| 33 |
- mesonargs+=( --cross-file "${T}/meson.${CHOST}" ) |
| 34 |
+ mesonargs+=( --cross-file "${T}/meson.${CHOST}.${ABI}" ) |
| 35 |
fi |
| 36 |
|
| 37 |
# https://bugs.gentoo.org/625396 |
Archives