Fix full toolchain build

diff --git a/lfs/binutils b/lfs/binutils
index 82955acefd8f8db2a5cd97ae2a4b4b835df314a6..25145cceed7741b252d0768ef8d1606e01e504b6 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -54,7 +54,7 @@ endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
-  EXTRA_CONFIG = --prefix=/tools --disable-nls
+  EXTRA_CONFIG = --prefix=/tools --disable-nls --disable-werror
   EXTRA_MAKE = LDFLAGS="-all-static"
   EXTRA_INSTALL = 
 else

diff --git a/lfs/cleanup-toolchain b/lfs/cleanup-toolchain
index 8b1119a8993f19fd5739f67d209d0a4e94ffe9b0..06d42311933c303422de13529969c28068a465c3 100644 (file)
--- a/lfs/cleanup-toolchain
+++ b/lfs/cleanup-toolchain
@@ -54,11 +54,11 @@ 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
-       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
-       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/*`
+       gcc -dumpspecs > /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/specs
+       sed 's@^/lib/ld-linux.so.2@/tools&@g' /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/specs > tempspecfile
+       mv -vf tempspecfile /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/specs
+       find /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/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.4/include/*`
 endif
 ifeq "$(PASS)" "2"
        -strip --strip-debug /tools/lib/*
@@ -74,6 +74,6 @@ ifeq "$(PASS)" "3"
        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;' > \
-           /tools/lib/gcc/i686-pc-linux-gnu/4.0.3/specs
+           /tools/lib/gcc/i686-pc-linux-gnu/4.0.4/specs
 endif
        @$(POSTBUILD)

diff --git a/src/patches/gcc-4.0.3-specs-1.patch b/src/patches/gcc-4.0.4-specs-1.patch
similarity index 100%
rename from src/patches/gcc-4.0.3-specs-1.patch
rename to src/patches/gcc-4.0.4-specs-1.patch