Prevent GCC's fixincludes from running during chapter 5 pass2 and chapter 6

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6959 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

2 files changed, 23 insertions, 20 deletions

diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index 302c1e1cd..74098b7a3 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -61,10 +61,18 @@ dynamic linker in the above commands. Refer back to <xref
 linkend="ch-tools-toolchaintechnotes" role=","/> if
 necessary.</para></important>
 
-<para>There is a possibility that some header files from the host system have
-found their way into GCC's private include dir. This can happen as a result of
-GCC's <quote>fixincludes</quote> process, which runs as part of the GCC build.
-This is explained in more detail later in this chapter. Run the following commands to remove those header files (you may find it easier to copy and paste these commands, rather than typing them by hand, due to their length):</para>
+<para>During the build process, GCC runs a script
+(<command>fixincludes</command>) that scans the system for header files that may
+need to be fixed (they might contain syntax errors, for example), and installs
+the fixed versions in a private include directory.  There is a possibility that,
+as a result of this process, some header files from the host system have found
+their way into GCC's private include dir. As the rest of this chapter only
+requires the headers from GCC and Glibc, which have both been installed at this
+point, any &quot;fixed&quot; headers can safely be removed.  This helps to avoid
+any host headers polluting the build environment.  Run the following commands to
+remove the header files in GCC's private include directory (you may find it
+easier to copy and paste these commands, rather than typing them by hand, due to
+their length):</para>
 
 <!-- && used to ease copy and pasting -->
 <screen><userinput>GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include &amp;&amp;
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index c52d6b446..904dff8db 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -58,24 +58,19 @@ Binutils until this issue is resolved. Please consult the LFS FAQ at <ulink
 url="&lfs-root;/lfs/faq.html#no-ptys"/> for more information on how to get PTYs
 working.</para>
 
-<para>Under normal circumstances, the GCC <command>fixincludes</command> script
-scans the system for header files that need to be fixed (they may contain syntax
-errors, for example).  The script might find that some Glibc header files on the
-host system need to be fixed, so fixes them and puts them in the GCC private
-include directory. In <xref linkend="chapter-building-system"/>, after the
-newer Glibc has been installed, this private include directory will be searched
-before the system include directory.  This may result in GCC finding the fixed
-headers from the host system, which most likely will not match the Glibc version
-used for the LFS system.</para>
-
-<para>The following command adjusts where the GCC <command>fixincludes</command>
-script searches for headers, so that it fixes only the new headers under
-<filename class="directory">/tools</filename>, not the ones from your host
-system.</para>
+<para>As previously explained in <xref linkend="ch-tools-adjusting"/>,  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 not to require fixing, the
+<command>fixincludes</command> script is not required.  As mentioned previously,
+the script may in fact 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>cp -v gcc/Makefile.in{,.orig} &amp;&amp;
-sed 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
-      gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
+sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
 
 <para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/>
 built GCC with the <option>-fomit-frame-pointer</option> compiler flag.