Zwischencommit fuer LFS.

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

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index a5cffbb2594c324b5c95c55cee5c1eac63dbb1ed..a818222025964d12ced80cef8016abcb33faeb53 100644 (file)
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -56,10 +56,9 @@ ifeq "$(PASS)" "1"
        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
-       /tools/bin/gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs
+       gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs
        sed 's@^/lib/ld-linux.so.2@/tools&@g' /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs > tempspecfile
        mv -vf tempspecfile /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs
-       GCC_INCLUDEDIR=/tools/lib/gcc/i686-pc-linux-gnu/4.0.3/include
        find /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/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.0.3/include/*`
 endif
@@ -76,7 +75,7 @@ ifeq "$(PASS)" "3"
        ln -sv /tools/bin/ld /tools/i686-pc-linux-gnu/bin/ld
        gcc -dumpspecs | \
        perl -p -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g;' \
-           -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-           `dirname $(gcc --print-libgcc-file-name)`/specs
+           -e 's@\*startfile_prefix_spec:\n@$$_/usr/lib/ @g;' > \
+           /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs
 endif
        @$(POSTBUILD)