Changeset 1ba726f

Timestamp:

01/30/2006 01:45:25 AM (18 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

b87ea87

Parents:

bedc966

Message:

Restore the use of *startfile_prefix_spec

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/gcc.xml (modified) (1 diff)
• chapter06/readjusting.xml (modified) (2 diffs)
• general.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -36 +36 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>January 29, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Restore the use of *startfile_prefix_spec.
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

chapter06/gcc.xml

@@ -100 +100 @@
 <screen><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
 
+<para>Many packages use the name <command>cc</command> to call the C
+compiler. To satisfy those packages, create a symlink:</para>
+
+<screen><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
+
 <note><para>At this point, it is strongly recommended to repeat the
 sanity check performed earlier in this chapter. Refer back to <xref

chapter06/readjusting.xml

@@ -20 +20 @@
 directories.</para>
 
-<para>First, create a symlink to the adjusted linker we created in chapter 5.</para>
+<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/$MACHTYPE/bin</filename></para>
 
-<screen><userinput>ln -sv /tools/bin/ld-new /usr/bin/ld</userinput></screen>
+<screen><userinput>mv -v /tools/bin/{ld,ld-old}
+mv -v /tools/$MACHTYPE/bin/{ld,ld-old}
+mv -v /tools/bin/{ld-new,ld}
+ln -sv /tools/bin/ld /tools/$MACHTYPE/bin/ld</userinput></screen>
 
 <para>Next, amend the GCC specs file so that it points to the new
-dynamic linker. A <command>sed</command> command accomplishes this:</para>
+dynamic linker, and so that GCC knows where to find its start files.
+A <command>perl</command> command accomplishes this:</para>
 
-<screen><userinput>SPECFILE=`dirname $(gcc -print-libgcc-file-name)`/specs &amp;&amp;
-gcc -dumpspecs > $SPECFILE &amp;&amp;
-sed -i -e '/^\*link:$/{n;s,$, -L/usr/lib,}' \
-       -e 's@^/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' $SPECFILE &amp;&amp;
-unset SPECFILE</userinput></screen>
+<screen><userinput>gcc -dumpspecs | \
+perl -pi -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g;' \
+     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' &gt; \
+     `dirname $(gcc --print-libgcc-file-name)`/specs
+</userinput></screen>
 
 <para>It is a good idea to visually inspect the specs file to verify the intended 
@@ -43 +49 @@
 linkend="ch-tools-toolchaintechnotes" role=","/> if
 necessary.</para></important>
-
-<para>Now create a temporary wrapper script for <filename>gcc</filename>.
-This script will point to the real <filename>gcc</filename>
-in <filename class="directory">/tools</filename> but with adjusted parameters
-to ensure that GCC in the next section links to our newly installed Glibc.</para>
-
-<screen><userinput>cat &gt; /usr/bin/gcc &lt;&lt; "EOF"
-#!/bin/bash
-/tools/bin/gcc -B/usr/lib/ -B/usr/bin/ $@
-EOF
-chmod 755 /usr/bin/gcc
-ln -s gcc /usr/bin/cc</userinput></screen>
 
 <caution><para>It is imperative at this point to stop and ensure that

general.ent

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060126">
-<!ENTITY releasedate "January 26, 2006">
+<!ENTITY version "SVN-20060129">
+<!ENTITY releasedate "January 29, 2006">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->