diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b8cae5d77..c23f1c9f1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -54,6 +54,17 @@
+
+ 2012-05-11
+
+
+ [matthew] - Remove sed from GCC pass 2 and chapter 6, which
+ prevented the fixincludes script from being run; it is no longer run
+ by default. Reported by Jeremy Huntwork.
+
+
+
+
2012-05-05
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 0fab67c16..6ae16a588 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -58,19 +58,6 @@
cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
`dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h
- Under normal circumstances the GCC fixincludes script
- is run in order to fix potentially broken header files. As GCC-&gcc-version;
- and Glibc-&glibc-version; have already been installed at this point, and
- their respective header files are known to not require fixing, the
- fixincludes script is not required. In fact, running
- this script may actually pollute the build environment by
- installing fixed headers from the host system into GCC's private include
- directory. The running of the fixincludes script can
- be suppressed by issuing the following commands:
-
-cp -v gcc/Makefile.in{,.orig}
-sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in
-
For x86 machines, a bootstrap build of GCC uses the
compiler flag. Non-bootstrap builds
omit this flag by default, and the goal should be to produce a compiler
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 1bec4066d..9ba825dc4 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -57,14 +57,6 @@
i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in ;;
esac
- The fixincludes script is known to occasionally
- erroneously attempt to "fix" the system headers installed so far.
- As the headers up to this point are known to not require fixing,
- issue the following command to prevent the fixincludes
- script from running:
-
-sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
The GCC documentation recommends building GCC outside of the source
directory in a dedicated build directory:
diff --git a/general.ent b/general.ent
index 4333f0cd0..216bcb7dd 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-
-
+
+