Changeset 30ae09bb

Timestamp:

02/26/2022 03:43:12 PM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/clfs-ng

Children:

db51ee9

Parents:

96dda27a

git-author:

Xi Ruoyao <xry111@…> (12/17/2021 12:09:06 PM)

git-committer:

Xi Ruoyao <xry111@…> (02/26/2022 03:43:12 PM)

Message:

cross-ng: gcc: don't rely on "uname -m"

Files:

• chapter05/gcc-pass1.xml (modified) (1 diff)
• chapter06/gcc-pass2.xml (modified) (1 diff)
• chapter08/gcc.xml (modified) (1 diff)

chapter05/gcc-pass1.xml

@@ -63 +63 @@
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>On x86_64 hosts, set the default directory name for
-    64-bit libraries to <quote>lib</quote>:</para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-  x86_64)
-    sed -e '/m64=/s/lib64/lib/' \
-        -i.orig gcc/config/i386/t-linux64
- ;;
-esac</userinput></screen>
+    <para>For x86_64 target, set the default directory name for
+    64-bit libraries to <quote>lib</quote>.  The command is unnecessary,
+    but harmless for 32-bit x86.  If you are building for another target,
+    you may need to adjust the command for your target.</para>
+
+<screen><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+    -i.orig gcc/config/i386/t-linux64</userinput></screen>
 
     <para>The GCC documentation recommends building GCC

chapter06/gcc-pass2.xml

@@ -55 +55 @@
 mv -v mpc-&mpc-version; mpc</userinput></screen>
 
-    <para>If building on x86_64, change the default directory name for 64-bit
-    libraries to <quote>lib</quote>:</para>
+    <para>For x86_64 target, set the default directory name for
+    64-bit libraries to <quote>lib</quote>.  The command is unnecessary,
+    but harmless for 32-bit x86.  If you are building for another target,
+    you may need to adjust the command for your target.</para>
 
-<screen><userinput remap="pre">case $(uname -m) in
-  x86_64)
-    sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64
-  ;;
-esac</userinput></screen>
+<screen><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+    -i.orig gcc/config/i386/t-linux64</userinput></screen>
+
 <!--
     <para>Fix an issue with GCC-10.1 when building with a cross

chapter08/gcc.xml

@@ -50 +50 @@
     -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp</userinput></screen>
 
-    <para>If building on x86_64, change the default directory name for 64-bit
-    libraries to <quote>lib</quote>:</para>
-
-<screen><userinput remap="pre">case $(uname -m) in
-  x86_64)
-    sed -e '/m64=/s/lib64/lib/' \
-        -i.orig gcc/config/i386/t-linux64
-  ;;
-esac</userinput></screen>
+    <para>For x86_64 target, set the default directory name for
+    64-bit libraries to <quote>lib</quote>.  The command is unnecessary,
+    but harmless for 32-bit x86.  If you are building for another target,
+    you may need to adjust the command for your target.</para>
+
+<screen><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+    -i.orig gcc/config/i386/t-linux64</userinput></screen>
 
     <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>