From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 3 May 2020 02:26:50 +0000 (-0400)
Subject: meson.eclass: include ABI in machine file names
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68e91160c7bd5aa61763ce19747d4837bab17d69;p=gentoo.git

meson.eclass: include ABI in machine file names

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 323b6ebf0953..dce5fffd894c 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -165,7 +165,7 @@ _meson_create_cross_file() {
 	local system cpu_family cpu
 	_meson_get_machine_info "${CHOST}"
 
-	local fn=${T}/meson.${CHOST}.ini
+	local fn=${T}/meson.${CHOST}.${ABI}.ini
 
 	cat > "${fn}" <<-EOF
 	[binaries]
@@ -215,7 +215,7 @@ _meson_create_native_file() {
 	local system cpu_family cpu
 	_meson_get_machine_info "${CBUILD}"
 
-	local fn=${T}/meson.${CBUILD}.ini
+	local fn=${T}/meson.${CBUILD}.${ABI}.ini
 
 	cat > "${fn}" <<-EOF
 	[binaries]