From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 May 2017 08:32:36 +0000 (+0100)
Subject: make.sh: Correctly set environment variables in toolchain pass
X-Git-Tag: v2.19-core112~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f172a3db01b779c55c0b2daec5585052a58b071;p=ipfire-2.x.git

make.sh: Correctly set environment variables in toolchain pass

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/tools/make-functions b/tools/make-functions
index ebe157a477..356162fab2 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -607,21 +607,21 @@ lfsmake1() {
 
 	cd $BASEDIR/lfs && env -i \
 		PATH="/tools/ccache/bin:/tools/bin:$PATH" \
+		CCACHE_DIR="${CCACHE_DIR}" \
+		CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
+		CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
 		make -f $* \
 			TOOLCHAIN=1 \
 			CROSSTARGET="${CROSSTARGET}" \
 			BUILDTARGET="${BUILDTARGET}" \
 			BUILD_ARCH="${BUILD_ARCH}" \
 			BUILD_PLATFORM="${BUILD_PLATFORM}" \
-			CFLAGS="${CFLAGS}" \
-			CXXFLAGS="${CXXFLAGS}" \
 			LFS_BASEDIR="${BASEDIR}" \
 			ROOT="${LFS}" \
 			KVER="${KVER}" \
 			MAKETUNING="${MAKETUNING}" \
-			CCACHE_DIR="${CCACHE_DIR}" \
-			CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
-			CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
 			install >> $LOGFILE 2>&1
 
 	local COMPILE_SUCCESS=$?