Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc...

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

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index cc66a2d2fc3bb4fab9215c75a743a80577335304..a200c2b6d5734decb8aa37f318c458f8db529a97 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
 ###############################################################################
@@ -54,17 +56,20 @@ ifeq "$(PASS)" "1"
        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)/4.1.2/specs
-       sed 's@^/lib/ld-linux.so@/tools&@g' /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs > tempspecfile
-       mv -vf tempspecfile /tools/lib/gcc/$(BUILDTARGET)/4.1.2/specs
-       find /tools/lib/gcc/$(BUILDTARGET)/4.1.2/include/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \;
-       rm -vf `grep -l "DO NOT EDIT THIS FILE" /tools/lib/gcc/$(BUILDTARGET)/4.1.2/include/*`
+       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"
        mv -v /tools/bin/{ld,ld-old}
@@ -74,6 +79,6 @@ ifeq "$(PASS)" "3"
        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)/4.1.2/specs
+           /tools/lib/gcc/$(BUILDTARGET)/$(GCC_VER)/specs
 endif
        @$(POSTBUILD)