From 6ab77404e3e14abd6e184a0e4dcd3222566e4acb Mon Sep 17 00:00:00 2001
From: Gerard Beekmans <gerard@linuxfromscratch.org>
Date: Mon, 5 May 2003 22:28:14 +0000
Subject: fixed gcc installation instructions - no bootstrap, no /usr/lib/cpp
 symlink, fixed patch filename

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2521 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/binutils-inst.xml | 6 +++---
 chapter06/gcc-inst.xml      | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml
index f9c329061..588caee4b 100644
--- a/chapter06/binutils-inst.xml
+++ b/chapter06/binutils-inst.xml
@@ -23,9 +23,9 @@ cd ../binutils-build</userinput></screen></para>
 
 <para>Continue with compiling the package:</para>
 
-<para><screen><userinput>make LDFLAGS="-s"</userinput></screen></para>
+<para><screen><userinput>make tooldir=/usr LDFLAGS="-s"</userinput></screen></para>
 
-<para><screen><userinput>make -k check</userinput></screen></para>
+<para><screen><userinput>make check</userinput></screen></para>
 
 <para>Normally, the <emphasis>tooldir</emphasis> (the directory where the
 executables end up) is set to $(exec_prefix)/$(target_alias) which expands
@@ -37,7 +37,7 @@ executed on Apple PowerPC machines).</para>
 
 <para>Install the package:</para>
 
-<para><screen><userinput>make install</userinput></screen></para>
+<para><screen><userinput>make tooldir=/usr install</userinput></screen></para>
 
 <para><screen><userinput>rm /usr/lib/libiberty.a</userinput></screen></para>
 
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index 6f16a3b3e..b5ac29eff 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -14,7 +14,7 @@ need to unpack both the gcc-core and gcc-g++ tarballs. Other compilers are
 available in the full gcc package; instructions for building them may be
 found at <ulink url="&blfs-root;view/cvs/general/gcc.html"/>.</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixedincludes.patch
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes.patch
 patch -Np1 -i ../gcc-&gcc-version;-mmap_test.patch</userinput></screen></para>
 
 <para>It is recommended by the GCC installation documentation to build GCC
@@ -55,8 +55,7 @@ is implemented.</para></listitem>
 
 <para>Continue with compiling the package:</para>
 
-<para><screen><userinput>make BOOT_LDFLAGS="-s" BOOT_CFLAGS="-O2 -pipe" \
-&nbsp;&nbsp;&nbsp;&nbsp;STAGE1_CFLAGS="-pipe" bootstrap</userinput></screen></para>
+<para><screen><userinput>make LDFLAGS="-s"</userinput></screen></para>
 
 <para><screen><userinput>make -k check</userinput></screen></para>
 
@@ -68,8 +67,7 @@ is implemented.</para></listitem>
 <filename>/lib</filename> and <filename>/usr/lib</filename> directories.
 To honor those packages, create two symlinks:</para>
 
-<para><screen><userinput>ln -s ../usr/bin/cpp /lib &amp;&amp;
-ln -s ../bin/cpp /usr/lib</userinput></screen></para>
+<para><screen><userinput>ln -s ../usr/bin/cpp /lib</userinput></screen></para>
 
 <para>Many packages compile using <emphasis>cc</emphasis> as the name for
 the C compiler. To satisfy those packages, create a <emphasis>cc</emphasis>
-- 
cgit v1.2.3-54-g00ecf