aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorGreg Schafer <greg@linuxfromscratch.org>2003-10-07 00:41:12 +0000
committerGreg Schafer <greg@linuxfromscratch.org>2003-10-07 00:41:12 +0000
commitf57e3d1ad9e6bfe96ebf823be19da0e07d81d52b (patch)
treea5712a4b851f5cbdfaa4774de45e908006dcd896 /chapter06
parent04a335156f4e0a83bf7d1bf3173cff3bd55f9695 (diff)
Rearrange "How things are going to be done" section. Simplify seds in "Locking in Glibc" and "Re-adjusting the toolchain" sections. Miscellaneous other fixes.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2931 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/adjustingtoolchain.xml13
-rw-r--r--chapter06/gcc-inst.xml4
2 files changed, 12 insertions, 5 deletions
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index b033a8d3f..ba61d857a 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -17,8 +17,8 @@ adjusted linker by running the following from within the
<note><para>If you somehow missed the earlier warning to retain the Binutils
source and build directories from the second pass in Chapter 5 or otherwise
accidentally deleted them or just don't have access to them, don't worry, all is
-not lost. Just ignore this step. The result will be that the next package,
-Binutils, will link against the Glibc libraries in
+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
@@ -41,8 +41,7 @@ to the new dynamic linker. Just like earlier on, we use a sed to accomplish
this:</para>
<para><screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs
-sed -e 's@/tools/lib/ld.so.1@/lib/ld.so.1@g' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \
+sed -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \
&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > newspecfile
mv newspecfile $SPECFILE
unset SPECFILE</userinput></screen></para>
@@ -51,6 +50,12 @@ unset SPECFILE</userinput></screen></para>
before, it is a good idea to check the specs file to ensure the intended
changes were actually made.</para>
+<important><para>If you are working on a platform where the name of the dynamic
+linker is something other than <filename>ld-linux.so.2</filename>, you
+<emphasis>must</emphasis> substitute <filename>ld-linux.so.2</filename> with the
+name of your platform's dynamic linker in the above commands. Refer back to the
+"Toolchain technical notes" section if necessary.</para></important>
+
<caution><para>It is imperative at this point to stop and ensure that the
basic functions (compiling and linking) of the adjusted toolchain are working
as expected. For this we are going to perform a simple sanity check:</para>
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 9c986b56e..a070808ea 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -24,7 +24,9 @@ compilers. Instructions for building these can be found at
patch -Np1 -i ../gcc-&gcc-suppress-libiberty-patch-version;.patch</userinput></screen></para>
<para>The second patch here suppresses the installation of libiberty from GCC,
-as we will use the one provided by binutils instead.</para>
+as we will use the one provided by binutils instead. Be careful
+<emphasis>not</emphasis> to apply the GCC specs patch from Chapter 5
+here.</para>
<para>The GCC documentation recommends building GCC outside of the source
directory in a dedicated build directory:</para>