aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2002-09-29 22:59:15 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2002-09-29 22:59:15 +0000
commit62909d965ac5cfe1727712ca6a22be3bfc31892e (patch)
tree46a651d4e1f8a302f1fada8d30a172a1ea1d643c /chapter05
parenta425f86cca8d1562eab0d4365b14ac01203f761b (diff)
fixed gcc nofixincludes patch
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2156 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/gcc-exp.xml2
-rw-r--r--chapter05/gcc-inst.xml4
2 files changed, 2 insertions, 4 deletions
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml
index ae6d923ac..4ea02babf 100644
--- a/chapter05/gcc-exp.xml
+++ b/chapter05/gcc-exp.xml
@@ -6,7 +6,7 @@ This patch fixes a few bugs. In particular it contains the "copy fix" and
"var fix" documented at
<ulink url="http://www.zipworld.com.au/~gschafer/lfs-tweaks.html"/>.</para>
-<para><userinput>sed '/$(SHELL) .\/fixinc.sh/d':</userinput>
+<para><userinput>patch -Np1 -i ../gcc-3.2-nofixincludes-2.patch:</userinput>
This prevents the fixincludes script from running.</para>
<para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index 150faca41..997b7b7fb 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -15,9 +15,7 @@ been warned.</para>
<para>Install GCC by running the following commands:</para>
<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
-cp gcc/Makefile.in{,.backup} &amp;&amp;
-sed '/$(SHELL) .\/fixinc.sh/d' \
-&nbsp;&nbsp;&nbsp; gcc/Makefile.in.backup > gcc/Makefile.in &amp;&amp;
+patch -Np1 -i ../gcc-3.2-nofixincludes-2.patch &amp;&amp;
mkdir ../gcc-build &amp;&amp;
cd ../gcc-build &amp;&amp;
../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \