Skip to contentSkip to conversation

Reset critical environment variables

PATCH New Daniel Nyström 2 participants 2 messages Dec 25, 2010 – Dec 29, 2010 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Reset critical environment variables

Reset them early in top-level Makefile to ensure they're keept unset all the way through the build process.

This also removes the requirement of these variables being unset globally prior the build.

---
 Makefile                               |    6 ++++++
 toolchain/dependencies/dependencies.sh |    9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)
Makefile +6 -0
index f6ab07e..1974e1c 100644
@@ -186,6 +186,12 @@ cc-option=$(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev
 #############################################################
 unexport CROSS_COMPILE
 unexport ARCH
+unexport CC
+unexport CXX
+unexport CPP
+unexport CFLAGS
+unexport CXXFLAGS
+unexport GREP_OPTIONS
 
 GNU_HOST_NAME:=$(shell package/gnuconfig/config.guess)
 
toolchain/dependencies/dependencies.sh +0 -9
index a152d4b..766a478 100755
@@ -4,15 +4,6 @@
 
 export LC_ALL=C
 
-# Verify that critical environment variables aren't set
-for var in CC CXX CPP CFLAGS CXXFLAGS GREP_OPTIONS CROSS_COMPILE ARCH ; do
-    if test -n "$(eval echo '$'$var)" ; then
-	/bin/echo -e "\nYou must run 'unset $var' so buildroot can run with";
-	/bin/echo -e "a clean environment on your build machine\n";
-	exit 1;
-    fi
-done
-
 # Verify that grep works
 echo "WORKS" | grep "WORKS" >/dev/null 2>&1
 if test $? != 0 ; then
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 Reset critical environment variables

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Daniel" == Daniel Nystr?m <[email protected]> writes:

Daniel> Reset them early in top-level Makefile to ensure they're keept unset Daniel> all the way through the build process.

Daniel> This also removes the requirement of these variables being unset Daniel> globally prior the build.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard