diff options
Diffstat (limited to 'chapter05')
| -rw-r--r-- | chapter05/gcc-exp.xml | 4 | ||||
| -rw-r--r-- | chapter05/gcc-inst.xml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index c64f22f6c..ae6d923ac 100644 --- a/chapter05/gcc-exp.xml +++ b/chapter05/gcc-exp.xml @@ -6,8 +6,8 @@ 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>patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch:</userinput> -This patch prevents the fixincludes script from running.</para> +<para><userinput>sed '/$(SHELL) .\/fixinc.sh/d':</userinput> +This prevents the fixincludes script from running.</para> <para><userinput>--prefix=/static:</userinput> This is NOT a typo. GCC hard codes some paths while compiling and so we need to pass /static as the diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 36662b95d..b09ee4cdb 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -15,7 +15,8 @@ been warned.</para> <para>Install GCC by running the following commands:</para> <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch && -patch -Np1 -i ../gcc-&gcc-version;-nofixincludes.patch && +cp gcc/Makefile.in{,.backup} && +sed '/$(SHELL) .\/fixinc.sh/d' gcc/Makefile.in.backup > gcc/Makefile.in && mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \ |