aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2017-03-03 22:53:39 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2017-03-03 22:53:39 +0000
commit5fa3da5796f170cc7e0eba35b98760370383d3bf (patch)
treece3f3329f625fa56ffeb7af7c30f379105013c4d /chapter06
parent805a05392584ec283bb3c4baec93708e260b4a7a (diff)
Update to binutils-2.28. Moved m4 and
+ bc to before binutils to accomodate the gold linker + regression tests. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11201 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/chapter06.xml4
-rw-r--r--chapter06/createfiles.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 34c071103..f48b1ee62 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -23,6 +23,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="adjusting.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
@@ -38,13 +40,11 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 5f2264628..312888c0b 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -42,7 +42,7 @@
<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
ln -sv /tools/bin/perl /usr/bin
ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib
+ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
ln -sv bash /bin/sh</userinput></screen>