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 a87f706ff5b74d49fcbc797e9f0e1842d1dc7d28..e8af68a2ccf42d2944fca3c9c361041383e0b959 100755 (executable)
--- 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 49e8fba62cfd5e7ef005c336384bbae446e69b40..00478173a7849fd06b953b3d2ba1b52c85fc7cc7 100644 (file)
--- 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 \