aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter05/gcc-pass2.xml13
-rw-r--r--chapter06/gcc.xml8
-rw-r--r--general.ent4
4 files changed, 13 insertions, 23 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b8cae5d77..c23f1c9f1 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -55,6 +55,17 @@
</listitem>
<listitem>
+ <para>2012-05-11</para>
+ <itemizedlist>
+ <listitem>
+ <para>[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.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-05-05</para>
<itemizedlist>
<listitem>
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 @@
<screen><userinput remap="pre">cat gcc/limitx.h gcc/glimits.h gcc/limity.h &gt; \
`dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h</userinput></screen>
- <para>Under normal circumstances the GCC <command>fixincludes</command> 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
- <command>fixincludes</command> 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 <command>fixincludes</command> script can
- be suppressed by issuing the following commands:</para>
-
-<screen><userinput remap="pre">cp -v gcc/Makefile.in{,.orig}
-sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
-
<para>For x86 machines, a bootstrap build of GCC uses the
<option>-fomit-frame-pointer</option> 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 =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
esac</userinput></screen>
- <para>The <command>fixincludes</command> script is known to occasionally
- erroneously attempt to &quot;fix&quot; 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 <command>fixincludes</command>
- script from running:</para>
-
-<screen><userinput remap="pre">sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen>
-
<para>The GCC documentation recommends building GCC outside of the source
directory in a dedicated build directory:</para>
diff --git a/general.ent b/general.ent
index 4333f0cd0..216bcb7dd 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120510">
-<!ENTITY releasedate "May 10, 2012">
+<!ENTITY version "SVN-20120511">
+<!ENTITY releasedate "May 11, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->