meson-fix.patch

diff --git a/config/functions b/config/functions
index 502d63b21eba..d40f339a51df 100644
--- a/config/functions
+++ b/config/functions
@@ -383,47 +383,9 @@ setup_toolchain() {
   export MAKEFLAGS
 
   case "$1:$2" in
-    target:meson|init:meson)
-      export DESTIMAGE="target"
-      export AWK="gawk"
-      export CC="$TOOLCHAIN/bin/host-gcc"
-      export CXX="$TOOLCHAIN/bin/host-g++"
-      export CPP="cpp"
-      export LD="ld"
-      export AS="as"
-      export AR="ar"
-      export NM="nm"
-      export RANLIB="ranlib"
-      export OBJCOPY="objcopy"
-      export OBJDUMP="objdump"
-      export STRIP="strip"
-      export CPPFLAGS="$HOST_CPPFLAGS"
-      export CFLAGS="$HOST_CFLAGS"
-      export CXXFLAGS="$HOST_CXXFLAGS"
-      export LDFLAGS="$HOST_LDFLAGS"
-      setup_pkg_config_target
-      export TARGET_CC="${TARGET_PREFIX}gcc"
-      export TARGET_CXX="${TARGET_PREFIX}g++"
-      export TARGET_AR="${TARGET_PREFIX}ar"
-      export TARGET_STRIP="${TARGET_PREFIX}strip"
-      export TARGET_CFLAGS="$TARGET_CFLAGS"
-      export TARGET_CXXFLAGS="$TARGET_CXXFLAGS"
-      export TARGET_LDFLAGS="$TARGET_LDFLAGS"
-      export HOST_CC="$CC"
-      export HOST_CXX="$CXX"
-      export HOSTCC="$CC"
-      export HOSTCXX="$CXX"
-      export CC_FOR_BUILD="$CC"
-      export CXX_FOR_BUILD="$CXX"
-      export BUILD_CC="$CC"
-      export BUILD_CXX="$CXX"
-      export _python_sysroot="$SYSROOT_PREFIX"
-      export _python_prefix=/usr
-      export _python_exec_prefix=/usr
-      ;;
-
     target:*|init:*)
       export DESTIMAGE="target"
+      export AWK="gawk"
       export CC="${TARGET_PREFIX}gcc"
       export CXX="${TARGET_PREFIX}g++"
       export CPP="${TARGET_PREFIX}cpp"
@@ -608,12 +570,12 @@ create_meson_conf_target() {
 
   cat > $2 <<EOF
 [binaries]
-c = '$TARGET_CC'
+c = '$CC'
 c_ld = '$linker'
-cpp = '$TARGET_CXX'
+cpp = '$CXX'
 cpp_ld = '$linker'
-ar = '$TARGET_AR'
-strip = '$TARGET_STRIP'
+ar = '$AR'
+strip = '$STRIP'
 pkg-config = '$PKG_CONFIG'
 llvm-config = '$SYSROOT_PREFIX/usr/bin/llvm-config'
 libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'