rust: unexport host sccache env variable
authorTianling Shen <cnsztl@immortalwrt.org>
Sun, 31 Dec 2023 05:36:26 +0000 (13:36 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Wed, 10 Jan 2024 11:53:06 +0000 (19:53 +0800)
Users might configure their own env variables on the host, and sometimes
it can lead build failure or unexpected behavior.

Fixes: #22889
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 9f01010958b9f57ef51903f69c7223eaefabf139)

lang/rust/Makefile
lang/rust/rust-values.mk

index ba322cf1dcb8fb212ef2e2c5b586190d7174963c..b8f03ae9491edbefd11f84a6af532671b739bc97 100644 (file)
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rust
 PKG_VERSION:=1.74.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
index 7a4d1fcf888bf6235b29d527257cd54061b57749..534aaa02a056e52f10ef026768e973a91ec4f552 100644 (file)
@@ -2,6 +2,12 @@
 #
 # Copyright (C) 2023 Luca Barbato and Donald Hoskins
 
+# Clear environment variables which should be handled internally,
+# as users might configure their own env on the host
+
+# CCache
+unexport RUSTC_WRAPPER
+
 # Rust Environmental Vars
 RUSTC_HOST_SUFFIX:=$(word 4, $(subst -, ,$(GNU_HOST_NAME)))
 RUSTC_HOST_ARCH:=$(HOST_ARCH)-unknown-linux-$(RUSTC_HOST_SUFFIX)