Changeset 797ada6

Timestamp:

03/25/2019 09:03:00 AM (5 years ago)

Author:

Xi Ruoyao <xry111@…>

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, 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:

0e800df

Parents:

93058448

Message:

Use GCC option -ffile-prefix-map to simplify chapter 6 Glibc instruction

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/glibc.xml (modified) (3 diffs)

chapter01/changelog.xml

@@ -43 +43 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2019-03-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Use -ffile-prefix-map instead of -isystem and
+          symlinks in the Glibc build to simplify the instruction.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

chapter06/glibc.xml

@@ -61 +61 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-glob-patch;</userinput></screen>
--->
+--><!--
     <para>First create a compatibility symlink to avoid references to /tools in
     our final glibc:</para>
 
 <screen><userinput remap="pre">ln -sfv /tools/lib/gcc /usr/lib</userinput></screen>
-
-    <para>Determine the GCC include directory and create a symlink for LSB
+-->
+    <para>Create a symlink for LSB
     compliance. Additionally, for x86_64, create a compatibility symlink
     required for the dynamic loader to function correctly:</para>
 
 <screen><userinput remap="pre">case $(uname -m) in
-    i?86)    GCC_INCDIR=/usr/lib/gcc/$(uname -m)-pc-linux-gnu/&gcc-version;/include
-            ln -sfv ld-linux.so.2 /lib/ld-lsb.so.3
+    i?86)   ln -sfv ld-linux.so.2 /lib/ld-lsb.so.3
     ;;
-    x86_64) GCC_INCDIR=/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
-            ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64
+    x86_64) ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64
             ln -sfv ../lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
     ;;
 esac</userinput></screen>
-
+<!--
     <para>Remove a file that may be left over from a previous build attempt:
     </para>
 
 <screen><userinput remap="pre">rm -f /usr/include/limits.h</userinput></screen>
-
+-->
     <para>The Glibc documentation recommends building Glibc 
     in a dedicated build directory:</para>
@@ -94 +92 @@
     <para>Prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">CC="gcc -isystem $GCC_INCDIR -isystem /usr/include" \
+<screen><userinput remap="configure">CC="gcc -ffile-prefix-map=/tools=/usr" \
 ../configure --prefix=/usr                          \
              --disable-werror                       \
              --enable-kernel=&min-kernel;                    \
              --enable-stack-protector=strong        \
-             libc_cv_slibdir=/lib
-unset GCC_INCDIR</userinput></screen>
+             libc_cv_slibdir=/lib</userinput></screen>
 
    <variablelist>
@@ -106 +103 @@
 
       <varlistentry>
-        <term><parameter>CC="gcc -isystem $GCC_INCDIR -isystem /usr/include"</parameter></term>
-        <listitem>
-          <para>Setting the location of both gcc and system include directories
-          avoids introduction of invalid paths in debugging symbols.</para>
+        <term><parameter>CC="gcc -ffile-prefix-map=/tools=/usr"</parameter></term>
+        <listitem>
+          <para>Make GCC record any references to files in /tools in result
+          of the compilation as if the files resided in /usr.  This avoids
+          introduction of invalid paths in debugging symbols.</para>
         </listitem>
       </varlistentry>