Remove unneeded patches.

[ipfire-2.x.git] / lfs / cleanup-toolchain

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index a200c2b6d5734decb8aa37f318c458f8db529a97..1be39fef6ca6580c614957aa31aa468a24752fa9 100644 (file)
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -52,24 +52,20 @@ 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/*`
+       SPECS=$$(dirname $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name))/specs; \
+       /tools/bin/$(CROSSTARGET)-gcc -dumpspecs | sed \
+               -e 's@/lib\(64\)\?/ld@/tools&@g' \
+               -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
+
        -strip --strip-debug /tools/lib/*
        -strip --strip-unneeded /tools/{,s}bin/*
-       rm -rfv /tools/{info,man} /usr/local/man
+       rm -rfv /tools/{,share}/{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"
        mv -v /tools/bin/{ld,ld-old}