From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Apr 2017 16:28:08 +0000 (+0200)
Subject: toolchain: Drop first pass of cleanup-toolchain script
X-Git-Tag: v2.19-core112~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ef98fe9bed0c8a9379b105a556f5cc7c855668d;p=ipfire-2.x.git

toolchain: Drop first pass of cleanup-toolchain script

This is no longer necessary

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

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index 90369889d9..e904bca87a 100644
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -52,12 +52,6 @@ md5 :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 ifeq "$(PASS)" "1"
-	SPECS=$$(dirname $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name))/specs; \
-	/tools/bin/$(CROSSTARGET)-gcc -dumpspecs | sed \
-		-e "/^\*cpp:$$/{n;s,$$, -isystem /tools/include,}" > $$SPECS
-endif
-
-ifeq "$(PASS)" "2"
 	# Remove the first cross compiler which is not needed anymore.
 	find /tools/ -name "$(CROSSTARGET)*" | xargs rm -rfv
 
@@ -74,7 +68,7 @@ ifeq "$(PASS)" "2"
 	/tools/sbin/ldconfig
 endif
 
-ifeq "$(PASS)" "3"
+ifeq "$(PASS)" "2"
 	mv -v /tools/bin/{ld,ld-old}
 	mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
 	mv -v /tools/bin/{ld-new,ld}
diff --git a/make.sh b/make.sh
index 5c290d54f7..beaee1eeb3 100755
--- a/make.sh
+++ b/make.sh
@@ -284,7 +284,6 @@ buildtoolchain() {
     lfsmake1 gcc			PASS=1
     lfsmake1 linux			KCFG="-headers"
     lfsmake1 glibc
-    lfsmake1 cleanup-toolchain		PASS=1
     lfsmake1 gcc			PASS=L
     lfsmake1 binutils			PASS=2
     lfsmake1 gcc			PASS=2
@@ -313,7 +312,7 @@ buildtoolchain() {
     lfsmake1 texinfo
     lfsmake1 xz
     lfsmake1 fake-environ
-    lfsmake1 cleanup-toolchain		PASS=2
+    lfsmake1 cleanup-toolchain		PASS=1
 }
 
 buildbase() {
@@ -324,7 +323,7 @@ buildbase() {
     lfsmake2 man-pages
     lfsmake2 glibc
     lfsmake2 tzdata
-    lfsmake2 cleanup-toolchain		PASS=3
+    lfsmake2 cleanup-toolchain		PASS=2
     lfsmake2 zlib
     lfsmake2 binutils
     lfsmake2 gmp