aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Schafer <greg@linuxfromscratch.org>2003-10-16 06:54:55 +0000
committerGreg Schafer <greg@linuxfromscratch.org>2003-10-16 06:54:55 +0000
commitd5f8a8fb450367a3e8e1724f81b50576290fc248 (patch)
tree2afab4d910cb200c5cf5e2fb9c82327bd1944b6a
parent234c74e3330f9225e7e0489039a8cc09513817ba (diff)
Fine tune toolchain adjustment commands.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2994 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/lockingglibc.xml8
-rw-r--r--chapter06/adjustingtoolchain.xml8
2 files changed, 10 insertions, 6 deletions
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index 02ba66b3c..45ab0d683 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -29,11 +29,13 @@ Binutils build and source directories.</para>
<para>The next thing to do is to amend our GCC specs file so that it points
to the new dynamic linker. A simple sed will accomplish this:</para>
+
+<!-- Ampersands are needed to allow cut and paste -->
-<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs
+<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs &amp;&amp;
sed -e 's@/lib/ld-linux.so.2@/tools/lib/ld-linux.so.2@g' \
-&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > tempspecfile
-mv tempspecfile $SPECFILE
+&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > tempspecfile &amp;&amp;
+mv -f tempspecfile $SPECFILE &amp;&amp;
unset SPECFILE</userinput></screen>
<para>We recommend that you cut-and-paste the above rather than try and type it
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index c20a67be8..f07562f9c 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -40,10 +40,12 @@ problem here. The above command takes care of this also.</para>
to the new dynamic linker. Just like earlier on, we use a sed to accomplish
this:</para>
-<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs
+<!-- Ampersands are needed to allow cut and paste -->
+
+<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs &amp;&amp;
sed -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \
-&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > newspecfile
-mv newspecfile $SPECFILE
+&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > newspecfile &amp;&amp;
+mv -f newspecfile $SPECFILE &amp;&amp;
unset SPECFILE</userinput></screen>
<para>Again, cutting and pasting the above is recommended. And just like