diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2005-08-15 21:40:17 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2005-08-15 21:40:17 +0000 |
| commit | 0de123e49485d455aa375ff48a78dcc1bc905b07 (patch) | |
| tree | 243b726b74b9543e4cd17d6252dd8c13b2abf645 | |
| parent | 78675cc9b37772164698eee1a97a843a5d428a11 (diff) | |
Prevent GCC's -fomit-frame-pointer sed from breaking if invoked more than once
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/gcc4/BOOK@6693 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 3 | ||||
| -rw-r--r-- | chapter05/gcc-pass2.xml | 2 | ||||
| -rw-r--r-- | chapter06/gcc.xml | 2 | ||||
| -rw-r--r-- | general.ent | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d1401ce75..fcb8c7edb 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -118,6 +118,9 @@ First a summary, then a detailed log.</para> </itemizedlist> </listitem> +<listitem><para>August 15th, 2005 [matt]: Alter the GCC -fomit-frame-pointer sed +to protect from multiple invocations (Greg Schafer)</para></listitem> + <listitem><para>August 14th, 2005 [matt]: Mention the common libmudflap test failures in GCC (fixes bug 1615).</para></listitem> diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 02fc31abf..e6724e1a6 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -82,7 +82,7 @@ Non-bootstrap builds omit this flag by default, so apply the following <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>sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' 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> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 6906028b8..de204c1f4 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -51,7 +51,7 @@ Non-bootstrap builds omit this flag by default, so apply the following <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>sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in</userinput></screen> <para>The GCC documentation recommends building GCC outside of the source directory in a dedicated build directory:</para> diff --git a/general.ent b/general.ent index 06a9faca4..1e07eaae2 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!ENTITY version "GCC4-20050814"> -<!ENTITY releasedate "August 14, 2005"> +<!ENTITY version "GCC4-20050815"> +<!ENTITY releasedate "August 15, 2005"> <!ENTITY milestone "6.2"> <!ENTITY generic-version "gcc4"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" --> |