X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcleanup-toolchain;h=0b3252f9f4f23185f2696d32e88d1ad543f7f718;hp=1be39fef6ca6580c614957aa31aa468a24752fa9;hb=607c9d3ae05eaa5de02c51aa5923505f7c5026c3;hpb=025b7ad557b27ef0964e4b218549703f4d34e946

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index 1be39fef6..0b3252f9f 100644
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -62,19 +62,29 @@ ifeq "$(PASS)" "2"
 	# Remove the first cross compiler which is not needed anymore.
 	find /tools/ -name "$(CROSSTARGET)*" | xargs rm -rfv
 
-	-strip --strip-debug /tools/lib/*
-	-strip --strip-unneeded /tools/{,s}bin/*
-	rm -rfv /tools/{,share}/{info,man} /usr/local/man
-	chown -R root:root /tools
+	# 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
 endif
+
 ifeq "$(PASS)" "3"
 	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)