| 1 |
commit: 68e91160c7bd5aa61763ce19747d4837bab17d69 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 3 02:26:50 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 02:26:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e91160 |
| 7 |
|
| 8 |
meson.eclass: include ABI in machine file names |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/meson.eclass | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 16 |
index 323b6ebf095..dce5fffd894 100644 |
| 17 |
--- a/eclass/meson.eclass |
| 18 |
+++ b/eclass/meson.eclass |
| 19 |
@@ -165,7 +165,7 @@ _meson_create_cross_file() { |
| 20 |
local system cpu_family cpu |
| 21 |
_meson_get_machine_info "${CHOST}" |
| 22 |
|
| 23 |
- local fn=${T}/meson.${CHOST}.ini |
| 24 |
+ local fn=${T}/meson.${CHOST}.${ABI}.ini |
| 25 |
|
| 26 |
cat > "${fn}" <<-EOF |
| 27 |
[binaries] |
| 28 |
@@ -215,7 +215,7 @@ _meson_create_native_file() { |
| 29 |
local system cpu_family cpu |
| 30 |
_meson_get_machine_info "${CBUILD}" |
| 31 |
|
| 32 |
- local fn=${T}/meson.${CBUILD}.ini |
| 33 |
+ local fn=${T}/meson.${CBUILD}.${ABI}.ini |
| 34 |
|
| 35 |
cat > "${fn}" <<-EOF |
| 36 |
[binaries] |
Archives