mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 12:32:15 +02:00
meson: make wrapper options sub-command specific
The meson-wrapper adds setup options to facilitate cross-compilation. The current options are exclusive to the setup sub-command and might cause issues with other sub-commands. Update the wrapper to make options sub-command specific. (From OE-Core rev: 4475250ee0d83cc90322f2fcd9ec8df7c05b6903) Signed-off-by: Liam Beguin <liambeguin@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 7bcda141f2019862b4fb5d8dec7956cd8344b420) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
1c94f9d64b
commit
33711d546d
@@ -5,7 +5,7 @@ if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
|
||||
fi
|
||||
|
||||
if [ -z "$SSL_CERT_DIR" ]; then
|
||||
export SSL_CERT_DIR="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/"
|
||||
export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/etc/ssl/certs/"
|
||||
fi
|
||||
|
||||
# If these are set to a cross-compile path, meson will get confused and try to
|
||||
@@ -13,7 +13,20 @@ fi
|
||||
# config is already in meson.cross.
|
||||
unset CC CXX CPP LD AR NM STRIP
|
||||
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
-*) continue ;;
|
||||
*) SUBCMD="$arg"; break ;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ "$SUBCMD" = "setup" ] || [ -d "$SUBCMD" ]; then
|
||||
MESON_SUB_OPTS=" \
|
||||
--cross-file="$OECORE_NATIVE_SYSROOT/usr/share/meson/${TARGET_PREFIX}meson.cross" \
|
||||
--native-file="$OECORE_NATIVE_SYSROOT/usr/share/meson/meson.native" \
|
||||
"
|
||||
fi
|
||||
|
||||
exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \
|
||||
--cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \
|
||||
--native-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/meson.native" \
|
||||
"$@"
|
||||
"$@" \
|
||||
$MESON_SUB_OPTS
|
||||
|
||||
Reference in New Issue
Block a user