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

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-04-13 19:01:28 +02:00
parent fdfddd6462
commit e467a2f274
2 changed files with 3 additions and 4 deletions

View File

@@ -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() {

View File

@@ -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 \