Changeset 3ce8d1a for chapter06

Timestamp:

02/06/2016 04:05:04 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

7.9-systemd

Children:

ea7cc21

Parents:

778f20d

Message:

Merge r11000 and r11001 from trunk.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/systemd@11002 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• adjusting.xml (modified) (1 diff)
• binutils.xml (modified) (1 diff)
• grep.xml (modified) (1 diff)

chapter06/adjusting.xml

@@ -17 +17 @@
   <para>First, backup the <filename class="directory">/tools</filename> linker,
   and replace it with the adjusted linker we made in chapter 5. We'll also create
-  a link to its counterpart in <filename class="directory">/tools/$(gcc
-  -dumpmachine)/bin</filename>:</para>
+  a link to its counterpart in
+  <filename class="directory">/tools/$(uname -m)-pc-linux-gnu/bin</filename>:</para>
 
 <screen><userinput>mv -v /tools/bin/{ld,ld-old}
-mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
+mv -v /tools/$(uname -m)-pc-linux-gnu/bin/{ld,ld-old}
 mv -v /tools/bin/{ld-new,ld}
-ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
+ln -sv /tools/bin/ld /tools/$(uname -m)-pc-linux-gnu/bin/ld</userinput></screen>
 
   <para>Next, amend the GCC specs file so that it points to the new

chapter06/binutils.xml

@@ -57 +57 @@
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
-<!--
-    <para>Fix some LTO tests in the test suite:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-testsuite-patch;</userinput></screen>
-
-    <para>Enable binutils to recognize multiple plugins:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
--->
+
+    <para>Fix a problem identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-upstream-patch;</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils 
     in a dedicated build directory:</para>

chapter06/grep.xml

@@ -52 +52 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
-
-    <para>The test-update-copyright.sh failure can be safely ignored.</para>
 
     <para>Install the package:</para>