diff options
author | Ross Burton <ross.burton@intel.com> | 2019-01-07 15:07:43 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-08 11:16:45 +0000 |
commit | c2556c44ecfb21c3fefddf12f9d9abdf482b90c7 (patch) | |
tree | 85b6c90b72f4fdf94e3859b0acc08d72c8078838 /meta/recipes-devtools/meson/meson/meson-wrapper | |
parent | 3bda6b8e0aa2656818e36a95e32252dc0e434105 (diff) | |
download | poky-c2556c44ecfb21c3fefddf12f9d9abdf482b90c7.tar.gz |
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.
(From OE-Core rev: 8596f871ef834a38e3375443f7eb08e43816347a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/meson-wrapper')
-rwxr-xr-x | meta/recipes-devtools/meson/meson/meson-wrapper | 2 |
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 | |||
10 | unset CC CXX CPP LD AR NM STRIP | 10 | unset CC CXX CPP LD AR NM STRIP |
11 | 11 | ||
12 | exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ | 12 | exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \ |
13 | --cross-file "$OECORE_NATIVE_SYSROOT/usr/share/meson/meson.cross" \ | 13 | --cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \ |
14 | "$@" | 14 | "$@" |