meson: remove obsolete environment unsets

We no longer need to remove environment variables because their behaviour
was fixed in meson 0.54.0[1].  The corresponding cleanup was done in
meson.bbclass some time ago[2] but was not done here.

[1] https://mesonbuild.com/Release-notes-for-0-54-0.html#environment-variables-with-cross-builds
[2] oe-core 20a5af2583d ("meson: use native-file instead of environment variables")

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/meson/meson/meson-wrapper b/meta/recipes-devtools/meson/meson/meson-wrapper
index 570b550e019f5beff9bbea554a31184e3f325b05..a0c1da232993a6466eaedee66706ba5aad16d60e 100755 (executable)
--- a/meta/recipes-devtools/meson/meson/meson-wrapper
+++ b/meta/recipes-devtools/meson/meson/meson-wrapper
@@ -10,11 +10,6 @@ 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
-
 case "$1" in
 setup|configure|dist|install|introspect|init|test|wrap|subprojects|rewrite|compile|devenv|env2mfile|help)
     MESON_CMD="$1"