Changeset a3df607 for chapter05/gcc-pass1.xml

Timestamp:

06/19/2019 06:19:25 PM (5 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

5839010

Parents:

5d327ae

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-pass1.xml (modified) (1 diff)

chapter05/gcc-pass1.xml

@@ -88 +88 @@
   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>In case the above seems hard to follow, let's break it down a bit.