aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/meson-wrapper
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-01-07 15:07:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-07 17:45:40 +0000
commit8596f871ef834a38e3375443f7eb08e43816347a (patch)
tree48e33b1f1cc368e301052c97b603ae3a38d28262 /meta/recipes-devtools/meson/meson/meson-wrapper
parentfdb5a8b3d437537aee53380091dabe6258667a49 (diff)
downloadopenembedded-core-contrib-8596f871ef834a38e3375443f7eb08e43816347a.tar.gz
openembedded-core-contrib-8596f871ef834a38e3375443f7eb08e43816347a.tar.bz2
openembedded-core-contrib-8596f871ef834a38e3375443f7eb08e43816347a.zip
meson: fix nativesdk-meson for multilib SDKs
Multilib SDKs differ only in the environment variables set, so nativesdk-meson's setup script needs to write a cross file for each environment. Rename the shipped meson.cross to meson.cross.template, as it cannot be used directly. Now that post-relocate scripts are called once for each environment, the generated meson.cross can be prefixed with TARGET_PREFIX to ensure it is unique. Finally rewrite the setup script to use string.Template to perform the expansion instead of hand-coding the logic. Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/meson-wrapper')
-rwxr-xr-xmeta/recipes-devtools/meson/meson/meson-wrapper2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper
index b2e00da513..d4ffe60f9a 100755
--- a/meta/recipes-devtools/meson/meson/meson-wrapper
+++ b/meta/recipes-devtools/meson/meson/meson-wrapper
@@ -10,5 +10,5 @@ fi
unset CC CXX CPP LD AR NM STRIP
exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \
- --cross-file "$OECORE_NATIVE_SYSROOT/usr/share/meson/meson.cross" \
+ --cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \
"$@"