aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06/adjustingtoolchain.xml
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2003-09-02 22:03:51 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2003-09-02 22:03:51 +0000
commit148bb04f8022ae1ea657d36ef04ff062bd023206 (patch)
tree163a20e0d2845c8e3d95609cf02b4f7b05825c7b /chapter06/adjustingtoolchain.xml
parent40add9445978e2619b7601d4536179b9ab2c065a (diff)
Renaming /stage1 to /tools.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2725 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06/adjustingtoolchain.xml')
-rw-r--r--chapter06/adjustingtoolchain.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index 3f31d81ee..eef803d7d 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -12,14 +12,14 @@ 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>make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
+<para><screen><userinput>make -C ld INSTALL=/tools/bin/install install-data-local</userinput></screen></para>
<para>The linker scripts now contain
-no mention of <filename class="directory">/stage1/lib</filename> anymore.
+no mention of <filename class="directory">/tools/lib</filename> anymore.
From now on every compiled program will link <emphasis>only</emphasis>
against the libraries in <filename>/usr/lib</filename> and
<filename>/lib</filename>. The extra
-<userinput>INSTALL=/stage1/bin/install</userinput> is needed because the
+<userinput>INSTALL=/tools/bin/install</userinput> is needed because the
Makefile created during the second pass still contains the reference to
<filename>/usr/bin/install</filename>, which we obviously haven't installed
yet.</para>
@@ -30,9 +30,9 @@ yet.</para>
to the new dynamic linker. Just like earlier on, we use a sed to accomplish
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' \
+<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' \
&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > newspecfile
mv newspecfile $SPECFILE
unset SPECFILE</userinput></screen></para>
@@ -42,10 +42,10 @@ 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
-<filename class="directory">/stage1/i686-pc-linux-gnu/lib</filename>. This
+<filename class="directory">/tools/i686-pc-linux-gnu/lib</filename>. This
is unavoidable, but luckily does not present a problem. There are no
-libraries in that location as all the temporary stage1 libraries are
-located in <filename class="directory">/stage1/lib</filename>.</para>
+libraries in that location as all the temporary tools libraries are
+located in <filename class="directory">/tools/lib</filename>.</para>
</sect1>