r964 - branches/2.4-branch/BOOK/chapter05 trunk/BOOK/chapter05

robert at linuxfromscratch.org robert at linuxfromscratch.org
Wed Feb 7 03:26:26 PST 2007


Author: robert
Date: 2007-02-07 04:26:26 -0700 (Wed, 07 Feb 2007)
New Revision: 964

Modified:
   branches/2.4-branch/BOOK/chapter05/gcc-pass2.xml
   trunk/BOOK/chapter05/cocoon-toolchain.xml
Log:
Fixed chapter5's GCC for uClibc's ld.so

Modified: branches/2.4-branch/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- branches/2.4-branch/BOOK/chapter05/gcc-pass2.xml	2007-02-07 11:17:20 UTC (rev 963)
+++ branches/2.4-branch/BOOK/chapter05/gcc-pass2.xml	2007-02-07 11:26:26 UTC (rev 964)
@@ -59,10 +59,14 @@
     <para>The next command adjusts the location of the default dynamic
     linker so it points to <filename class="directory">/tools</filename>:</para>
 
-<screen><userinput>cp -v gcc/config/i386/linux.h{,.orig}
+<screen condition="glibc"><userinput>cp -v gcc/config/i386/linux.h{,.orig}
 sed 's@/lib/ld-linux.so.2@/tools&@' \
     gcc/config/i386/linux.h.orig > gcc/config/i386/linux.h</userinput></screen>
 
+<screen condition="uclibc"><userinput>cp -v gcc/config/i386/linux.h{,.orig}
+sed 's@/lib/ld-linux.so.2@/tools/lib/ld-uClibc.so.0@' \
+    gcc/config/i386/linux.h.orig > gcc/config/i386/linux.h</userinput></screen>
+
     <para>The next command removes <filename class="directory">/usr/include</filename>
     from GCC's include search path. This ensures only our newly installed
     headers, in <filename class="directory">/tools/usr/include</filename>,

Modified: trunk/BOOK/chapter05/cocoon-toolchain.xml
===================================================================
--- trunk/BOOK/chapter05/cocoon-toolchain.xml	2007-02-07 11:17:20 UTC (rev 963)
+++ trunk/BOOK/chapter05/cocoon-toolchain.xml	2007-02-07 11:26:26 UTC (rev 964)
@@ -411,10 +411,14 @@
     <para>The next command adjusts the location of the default dynamic
     linker so it points to <filename class="directory">/tools</filename>:</para>
 
-<screen><userinput>cp -v gcc/config/i386/linux.h{,.orig}
+<screen condition="glibc"><userinput>cp -v gcc/config/i386/linux.h{,.orig}
 sed 's@/lib/ld-linux.so.2@/tools&@' \
     gcc/config/i386/linux.h.orig > gcc/config/i386/linux.h</userinput></screen>
 
+<screen condition="uclibc"><userinput>cp -v gcc/config/i386/linux.h{,.orig}
+sed 's@/lib/ld-linux.so.2@/tools/lib/ld-uClibc.so.0@' \
+    gcc/config/i386/linux.h.orig > gcc/config/i386/linux.h</userinput></screen>
+
     <para>The next command removes <filename class="directory">/usr/include</filename>
     from GCC's include search path. This ensures only our newly installed
     headers, in <filename class="directory">/tools/usr/include</filename>,




More information about the hlfs-book mailing list