aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/chapter06.xml31
-rw-r--r--chapter06/gcc.xml2
2 files changed, 19 insertions, 14 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 1012b15a5..eff1c295b 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -357,16 +357,21 @@ file records the bad login attempts.</para>
&c6-glibc;
-<sect1 id="ch-system-adjustingtoolchain">
+<sect1 id="ch-system-readjusting">
<title>Re-adjusting the toolchain</title>
-<?dbhtml filename="adjustingtoolchain.html" dir="chapter06"?>
-
-<para>Now that the new C libraries have been installed, it's time to re-adjust
-our toolchain. We'll adjust it so that it will link any newly compiled program
-against the new C libraries. Basically, this is the reverse of what we did
-in the "locking in" stage in the beginning of the previous chapter.</para>
-
-<para>The first thing to do is to adjust the linker. For this we retained the
+<?dbhtml filename="readjusting.html" dir="chapter06"?>
+
+<para>Now that the new and final C libraries have been installed, it's time to
+adjust our toolchain again. We'll adjust it so that it will link any newly
+compiled program against these new libraries. This is in fact the same we did
+in the "Adjusting" phase in the beginning of the previous chapter, even though
+it looks like the reverse: then we guided the chain from the host's
+<filename class="directory">{,/usr}/lib</filename> to the new
+<filename class="directory">/tools/lib</filename>, now we guide it from that
+same <filename class="directory">/tools/lib</filename>
+to the LFS's <filename class="directory">{,/usr}/lib</filename>.</para>
+
+<para>First we adjust the linker. For this we retained the
source and build directories from the second pass over Binutils. Install the
adjusted linker by running the following from within the
<filename class="directory">binutils-build</filename> directory:</para>
@@ -378,10 +383,10 @@ source and build directories from the second pass in
<xref linkend="chapter-temporary-tools"/>, or otherwise accidentally deleted them or just
don't have access to them, don't worry, all is not lost. Just ignore the above
command. The result will be that the next package, Binutils, will link against
-the Glibc libraries in <filename class="directory">/tools</filename> rather
-than <filename class="directory">/usr</filename>. This is not ideal, however,
-our testing has shown that the resulting Binutils program binaries should be
-identical.</para></note>
+the C libraries in <filename class="directory">/tools</filename> rather
+than <filename class="directory">{,/usr}/lib</filename>. This is not ideal,
+however, our testing has shown that the resulting Binutils program binaries
+should be identical.</para></note>
<para>From now on every compiled program will link <emphasis>only</emphasis>
against the libraries in <filename>/usr/lib</filename> and
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 7cf0f81a4..bb9467167 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -90,7 +90,7 @@ compiler. To satisfy those packages, create a symlink:</para>
<note><para>At this point it is strongly recommended to repeat the sanity check
we performed earlier in this chapter. Refer back to
-<xref linkend="ch-system-adjustingtoolchain"/> and repeat the check. If the results
+<xref linkend="ch-system-readjusting"/> and repeat the check. If the results
are wrong, then most likely you erroneously applied the GCC Specs patch from
<xref linkend="chapter-temporary-tools"/>.</para></note>