From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 13 Apr 2017 17:01:28 +0000 (+0200)
Subject: make.sh: Adjust toolchain PATH in lfsmake1 instead of globally
X-Git-Tag: v2.19-core111~18
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=e467a2f274cdff830b5d3646ed9c9ac5a117940d

make.sh: Adjust toolchain PATH in lfsmake1 instead of globally

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

diff --git a/make.sh b/make.sh
index a87f706ff5..e8af68a2cc 100755
--- a/make.sh
+++ b/make.sh
@@ -279,8 +279,6 @@ buildtoolchain() {
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
 
-    local ORG_PATH=$PATH
-    export PATH="/tools/ccache/bin:/tools/bin:$PATH"
     lfsmake1 ccache			PASS=1
     lfsmake1 binutils			PASS=1
     lfsmake1 gcc			PASS=1
@@ -316,7 +314,6 @@ buildtoolchain() {
     lfsmake1 xz
     lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain		PASS=2
-    export PATH=$ORG_PATH
 }
 
 buildbase() {
diff --git a/tools/make-functions b/tools/make-functions
index 49e8fba62c..00478173a7 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -565,7 +565,9 @@ lfsmake1() {
 
 	local PKG_TIME_START=`date +%s`
 
-	cd $BASEDIR/lfs && make -f $* 	BUILDTARGET=$BUILDTARGET \
+	cd $BASEDIR/lfs && \
+		PATH="/tools/ccache/bin:/tools/bin:$PATH" \
+		make -f $* 	BUILDTARGET=$BUILDTARGET \
 						CROSSTARGET="${CROSSTARGET}" \
 						MACHINE=$MACHINE \
 						MACHINE_TYPE=$MACHINE_TYPE \