diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/meson-wrapper')
| -rwxr-xr-x | meta/recipes-devtools/meson/meson/meson-wrapper | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper index b2e00da513..8fafaad975 100755 --- a/meta/recipes-devtools/meson/meson/meson-wrapper +++ b/meta/recipes-devtools/meson/meson/meson-wrapper @@ -4,11 +4,16 @@ if [ -z "$OECORE_NATIVE_SYSROOT" ]; then echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2 fi +if [ -z "$SSL_CERT_DIR" ]; then + 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 # use them as native tools. Unset them to prevent this, as all the cross-compile # config is already in meson.cross. 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" \ + --native-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/meson.native" \ "$@" |