summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Nyström <daniel.nystrom@timeterminal.se>2010-12-25 23:29:42 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-12-29 22:35:52 (GMT)
commit2bf3c1660965d73a553d3c99d6f1a62f36e0069b (patch)
treef0b68328b509431f27f49fab3f0315e100e090d9
parent17dfec8c9b92824544ba6e4e9d0e23614e2347ba (diff)
downloadbuildroot-2bf3c1660965d73a553d3c99d6f1a62f36e0069b.tar.gz
buildroot-2bf3c1660965d73a553d3c99d6f1a62f36e0069b.tar.bz2
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. Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--Makefile6
-rwxr-xr-xtoolchain/dependencies/dependencies.sh9
2 files changed, 6 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 9ba80a6..6d6e836 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index c5552ca..74ab213 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -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