From 026ebc069ec42e5ac400dfafcc9a697426649959 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 8 Feb 2019 17:36:42 +0100
Subject: [PATCH] common: unset rust-cross specific variables for native builds

---
 common/build-helper/rust.sh       | 2 ++
 common/xbps-src/shutils/common.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 550171e068a..04838bed2b7 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -16,6 +16,8 @@ if [ "$CROSS_BUILD" ]; then
 	# [build]
 	# target = ${RUST_TARGET}
 	export CARGO_BUILD_TARGET="$RUST_TARGET"
+else
+	unset CARGO_BUILD_TARGET
 fi
 
 # For cross-compiling rust -sys crates
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 69c6ac6dde3..405be4ac6e7 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -313,6 +313,7 @@ setup_pkg() {
         export XBPS_TARGET_MACHINE=${XBPS_ARCH:-$XBPS_MACHINE}
         unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS XBPS_CROSS_FFLAGS
         unset XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS
+        unset XBPS_CROSS_RUSTFLAGS XBPS_CROSS_RUST_TARGET
 
         XBPS_INSTALL_XCMD="$XBPS_INSTALL_CMD"
         XBPS_QUERY_XCMD="$XBPS_QUERY_CMD"
@@ -546,6 +547,7 @@ setup_pkg() {
         unset CC_host CXX_host CPP_host GCC_host FC_host LD_host AR_host AS_host
         unset RANLIB_host STRIP_host OBJDUMP_host OBJCOPY_host NM_host READELF_host
         unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host
+        unset RUSTFLAGS
     fi
 
     # Setup some specific package vars.