r6775 - in branches/gcc4/BOOK: . chapter01 chapter05

ken at linuxfromscratch.org ken at linuxfromscratch.org
Tue Aug 30 04:00:53 PDT 2005


Author: ken
Date: 2005-08-30 05:00:51 -0600 (Tue, 30 Aug 2005)
New Revision: 6775

Modified:
   branches/gcc4/BOOK/chapter01/changelog.xml
   branches/gcc4/BOOK/chapter05/gcc-pass2.xml
   branches/gcc4/BOOK/general.ent
Log:
Removed -i from sed commands in gcc-pass2

Modified: branches/gcc4/BOOK/chapter01/changelog.xml
===================================================================
--- branches/gcc4/BOOK/chapter01/changelog.xml	2005-08-29 19:11:10 UTC (rev 6774)
+++ branches/gcc4/BOOK/chapter01/changelog.xml	2005-08-30 11:00:51 UTC (rev 6775)
@@ -119,6 +119,9 @@
 </itemizedlist>
 </listitem>
 
+<listitem><para>August 30th, 2005 [ken]: Remove <command>sed -i</command>
+ commands from gcc-pass2.</para></listitem>
+
 <listitem><para>August 23rd, 2005 [matt]: <command>find</command> may fail due
 to a race condition when deleting files.  Remove the && construct in
 chapter05/adjusting.xml so that the rest of the commands for removing fixed

Modified: branches/gcc4/BOOK/chapter05/gcc-pass2.xml
===================================================================
--- branches/gcc4/BOOK/chapter05/gcc-pass2.xml	2005-08-29 19:11:10 UTC (rev 6774)
+++ branches/gcc4/BOOK/chapter05/gcc-pass2.xml	2005-08-30 11:00:51 UTC (rev 6775)
@@ -73,8 +73,9 @@
 <filename class="directory">/tools</filename>, not the ones from your host
 system.</para>
 
-<screen><userinput>sed -i 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g' \
-      gcc/Makefile.in</userinput></screen>
+<screen><userinput>cp gcc/Makefile.in{,.orig} &&
+sed 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include at g' \
+      gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
 
 <para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/>
 built GCC with the <option>-fomit-frame-pointer</option> compiler flag.
@@ -82,7 +83,9 @@
 <command>sed</command> to use it in order to ensure consistent compiler builds.
 </para>
 
-<screen><userinput>sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen>
+<screen><userinput>cp gcc/Makefile.in{,.tmp} &&
+sed 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
+	> gcc/Makefile.in</userinput></screen>
 
 <para>Apply the following patch to change the location of GCC's default dynamic
 linker (typically <filename class="libraryfile">ld-linux.so.2</filename>):</para>

Modified: branches/gcc4/BOOK/general.ent
===================================================================
--- branches/gcc4/BOOK/general.ent	2005-08-29 19:11:10 UTC (rev 6774)
+++ branches/gcc4/BOOK/general.ent	2005-08-30 11:00:51 UTC (rev 6775)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "GCC4-20050823">
-<!ENTITY releasedate "August 23, 2005">
+<!ENTITY version "GCC4-20050830">
+<!ENTITY releasedate "August 30, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "gcc4"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 




More information about the lfs-book mailing list