cleanup-toolchain: Use TOOLCHAIN variable

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2017-04-17 13:42:46 +02:00
parent 5d512a1f81
commit 174498ef96
2 changed files with 6 additions and 6 deletions

View File

@@ -51,7 +51,8 @@ md5 :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
ifeq "$(PASS)" "1"
ifeq "$(TOOLCHAIN)" "1"
# Remove the first cross compiler which is not needed anymore.
find /tools/ -name "$(CROSSTARGET)*" | xargs rm -rfv
@@ -66,9 +67,7 @@ ifeq "$(PASS)" "1"
# Update/create linker cache.
/tools/sbin/ldconfig
endif
ifeq "$(PASS)" "2"
else
mv -v /tools/bin/{ld,ld-old}
mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
mv -v /tools/bin/{ld-new,ld}
@@ -80,4 +79,5 @@ ifeq "$(PASS)" "2"
-e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \
$$(dirname $$(gcc -print-libgcc-file-name))/specs
endif
@$(POSTBUILD)

View File

@@ -316,7 +316,7 @@ buildtoolchain() {
lfsmake1 texinfo
lfsmake1 xz
lfsmake1 fake-environ
lfsmake1 cleanup-toolchain PASS=1
lfsmake1 cleanup-toolchain
}
buildbase() {
@@ -327,7 +327,7 @@ buildbase() {
lfsmake2 man-pages
lfsmake2 glibc
lfsmake2 tzdata
lfsmake2 cleanup-toolchain PASS=2
lfsmake2 cleanup-toolchain
lfsmake2 zlib
lfsmake2 binutils
lfsmake2 gmp