Remove unneeded patches.

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

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index bc6930c9e32aefa3bf29f9adaa4d63d5e9652735..1be39fef6ca6580c614957aa31aa468a24752fa9 100644 (file)
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -29,6 +29,8 @@ VER        = ipfire
 THISAPP    = cleanup-toolchain
 TARGET     = $(DIR_INFO)/$(THISAPP)-$(PASS)-tools
 
+GCC_VER    = 4.1.2
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -50,30 +52,29 @@ md5 :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
 ifeq "$(PASS)" "1"
-       mv -v /tools/bin/{ld,ld-old}
-       mv -v /tools/i686-pc-linux-gnu/bin/{ld,ld-old}
-       cp -v /tools/bin/{ld-new,ld}
-       ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld
-       gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs
-       sed 's@^/lib/ld-linux.so.2@/tools&@g' /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs > tempspecfile
-       mv -vf tempspecfile /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/specs
-       find /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
-       rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/i686-pc-linux-gnu/4.1.2/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
 endif
 ifeq "$(PASS)" "3"
        mv -v /tools/bin/{ld,ld-old}
-       mv -v /tools/i686-pc-linux-gnu/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/i686-pc-linux-gnu/bin/ld
+       ln -sv /tools/bin/ld /tools/$(BUILDTARGET)/bin/ld
        gcc -dumpspecs | \
-       perl -p -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g;' \
+       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/i686-pc-linux-gnu/4.1.2/specs
+           /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs
 endif
        @$(POSTBUILD)