X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcleanup-toolchain;h=91e056ed8348aafac07054824d988913204c47f5;hb=9c8395456753ac6b7fd0141a6b0be83415841bf0;hp=a200c2b6d5734decb8aa37f318c458f8db529a97;hpb=bbeb390b2d475d79ad5f8cabf3b69f5a52fbd3a8;p=ipfire-2.x.git

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index a200c2b6d5..91e056ed83 100644
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -27,7 +27,12 @@ include Config
 VER        = ipfire
 
 THISAPP    = cleanup-toolchain
-TARGET     = $(DIR_INFO)/$(THISAPP)-$(PASS)-tools
+
+ifeq "$(TOOLCHAIN)" "1"
+	TARGET = $(DIR_INFO)/$(THISAPP)-tools
+else
+	TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 
 GCC_VER    = 4.1.2
 
@@ -51,34 +56,36 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-ifeq "$(PASS)" "1"
-	mv -v /tools/bin/{ld,ld-old}
-	mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
-	cp -v /tools/bin/{ld-new,ld}
-	ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld
-	gcc -dumpspecs > /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs
-	sed 's@/lib/ld-linux.so@/tools&@g' /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs > tempspecfile
-	mv -vf tempspecfile /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs
-	find /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
-	rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/include/*`
-endif
-ifeq "$(PASS)" "2"
-	-strip --strip-debug /tools/lib/*
-	-strip --strip-unneeded /tools/{,s}bin/*
-	rm -rfv /tools/{info,man} /usr/local/man
-	chown -R root:root /tools
-
-	# Install CPUID header.
-	install -m 644 -v $(DIR_SRC)/headers/cpuid.h /tools/include
-endif
-ifeq "$(PASS)" "3"
+
+ifeq "$(TOOLCHAIN)" "1"
+	# Remove the first cross compiler which is not needed anymore.
+	find /tools/ -name "$(CROSSTARGET)*" | xargs rm -rfv
+
+	# Remove man and info pages.
+	rm -rfv /tools/{,share}/{info,man}
+
+	# Strip all binaries.
+	STRIP="/usr/bin/strip" $(DIR_SRC)/src/stripper /tools/
+
+	# Fix ownership of the toolchain.
+	chown -R root:root /tools/
+
+	# Update/create linker cache.
+	/tools/sbin/ldconfig
+
+	# Set a marker when the toolchain was successfully built
+	touch /tools/.toolchain-successful
+else
 	mv -v /tools/bin/{ld,ld-old}
 	mv -v /tools/$(BUILDTARGET)/bin/{ld,ld-old}
 	mv -v /tools/bin/{ld-new,ld}
 	ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld
-	gcc -dumpspecs | \
-	perl -p -e 's@/tools/lib/ld-linux.so@/lib/ld-linux.so@g;' \
-	    -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \
-	    /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs
+
+	gcc -dumpspecs | sed \
+		-e 's@/tools@@g' \
+		-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
+		-e '/\*cpp:/{n;s@$$@ -isystem /usr/include@}' > \
+		$$(dirname $$(gcc -print-libgcc-file-name))/specs
 endif
+
 	@$(POSTBUILD)