Changeset 5066dee for chapter05/gcc-pass2.xml

Timestamp:

03/31/2021 10:41:35 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

b2c61c6

Parents:

1803e9b

git-author:

Thomas Trepl <thomas@…> (06/19/2019 06:19:25 PM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:35 AM)

Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11623 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

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

chapter05/gcc-pass2.xml

@@ -76 +76 @@
   sed -e 's@/lib\(64\)\?\(32\)\?\(x32\)\?/ld@/tools&@g' \
       -e 's@/usr@/tools@g' $file.orig > $file
-  echo '
-#undef STANDARD_STARTFILE_PREFIX_1
-#undef STANDARD_STARTFILE_PREFIX_2
-#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"
-#define STANDARD_STARTFILE_PREFIX_2 ""' >> $file
   touch $file.orig
-done</userinput></screen>
+done
+sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/\";" \
+    -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_2/ s;\".*\";\"\";" \
+    -i gcc/gcc.c</userinput></screen>
 
     <para arch="default">If building on x86_64, change the default directory