Adjust binutils-pass1 so we don't need to hang on to its source directories.

Also use 'gcc -dumpmachine' instead of the MACHTYPE var.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7316 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 6 insertions, 9 deletions

diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 4435cfca0..a395c3dfe 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -105,7 +105,8 @@ cd ../binutils-build</userinput></screen>
     later on:</para>
 
 <screen><userinput>make -C ld clean
-make -C ld LIB_PATH=/tools/lib</userinput></screen>
+make -C ld LDFLAGS="-s" LIB_PATH=/tools/lib
+cp -v ld/ld-new /tools/bin</userinput></screen>
 
     <variablelist>
       <title>The meaning of the make parameters:</title>
@@ -120,10 +121,12 @@ make -C ld LIB_PATH=/tools/lib</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>-C ld LIB_PATH=/tools/lib</parameter></term>
+        <term><parameter>-C ld LDFLAGS="-s" LIB_PATH=/tools/lib</parameter></term>
         <listitem>
           <para>This option rebuilds everything in the <filename
-          class="directory">ld</filename> subdirectory. Specifying the
+          class="directory">ld</filename> subdirectory. The
+	  <envar>LDFLAGS</envar> variable will build a static version of
+	  <command>ld</command>. Specifying the
           <envar>LIB_PATH</envar> Makefile variable on the command line
           allows us to override the default value and point it to the
           temporary tools location. The value of this variable specifies
@@ -134,12 +137,6 @@ make -C ld LIB_PATH=/tools/lib</userinput></screen>
 
     </variablelist>
 
-    <warning>
-      <para><emphasis>Do not</emphasis> remove the Binutils build and source
-      directories yet. These will be needed again in their current state later
-      in this chapter.</para>
-    </warning>
-
   </sect2>
 
   <sect2 role="content">