aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2003-08-25 21:41:50 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2003-08-25 21:41:50 +0000
commit1f304328b4498d163eaef546b85409b769ee720a (patch)
tree7900e8a8dff7a0617b066081f37d0d1c32619239 /chapter06
parentb0dbf73848c280ec7059b2c66a6d541aedfe1b27 (diff)
uniformized text of 'locking' and 'adjusting'
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2677 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/adjustingtoolchain.xml27
1 files changed, 14 insertions, 13 deletions
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index f302cd014..d962f6ee2 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -1,20 +1,20 @@
<sect1 id="ch06-adjustingtoolchain">
-<title>Adjusting toolchain</title>
+<title>Re-adjusting the toolchain</title>
<?dbhtml filename="adjustingtoolchain.html" dir="chapter06"?>
-<para>Now that we have compiled all the necessary tools, it is time to
-re-adjust our toolchain. We will set it up so that it will link any newly
-compiled program against the new Glibc. Basically, this is the reverse of
-what we did in the "Locking in" stage in the beginning of chapter 5.</para>
+<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 scripts. For this we
-retained the <filename class="directory">binutils-build</filename>
-directory from the second pass over Binutils. Run the following:</para>
+retained the source and build directories from the second pass over Binutils.
+Install the adjusted linker scripts by running the following from within the
+<filename class="directory">binutils-build</filename> directory:</para>
-<para><screen><userinput>cd binutils-build
-make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
+<para><screen><userinput>make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
-<para>This installs the adjusted linker scripts. The linker scripts contain
+<para>The linker scripts now contain
no mention of <filename class="directory">/stage1/lib</filename> anymore.
From now on every compiled program will link <emphasis>only</emphasis>
against the libraries in <filename>/usr/lib</filename> and
@@ -32,12 +32,13 @@ this:</para>
<para><screen><userinput>SPECFILE=/stage1/lib/gcc-lib/*/*/specs
sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' $SPECFILE > XX
-mv XX $SPECFILE
+&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/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>
<para>Again, cutting and pasting the above is recommended. And just like
-before, it is a good idea to check the linker scripts and the specs file o
+before, it is a good idea to check the linker scripts and the specs file to
ensure the intended changes were actually made.</para>
<para>Note that the linker scripts will still contain a reference to