aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorRandy McMurchy <randy@linuxfromscratch.org>2008-10-13 13:32:41 +0000
committerRandy McMurchy <randy@linuxfromscratch.org>2008-10-13 13:32:41 +0000
commitc49647b10ac25ec57bb0f956f92cf3f36995aa47 (patch)
tree731778127ad7db646e7a8fdcea98b7576a8e3d0d /chapter05
parentef31c67389f768ca9a632fa0017ccc741a9da72e (diff)
Modified the Chapter 5 instructions so that instead of building the GMP and MPFR packages separately for GCC Pass2, they are built by GCC internally
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8661 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/chapter05.xml4
-rw-r--r--chapter05/gcc-pass1.xml2
-rw-r--r--chapter05/gcc-pass2.xml8
3 files changed, 11 insertions, 3 deletions
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 9afe0c18b..76250d2b8 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -22,8 +22,8 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="expect.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="dejagnu.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mpfr.xml"/>
+ <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gmp.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mpfr.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc-pass2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="binutils-pass2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 1731034da..8be69fb60 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -92,7 +92,7 @@ cd ../gcc-build</userinput></screen>
<varlistentry>
<term><parameter>--disable-shared</parameter></term>
<listitem>
- <para>This switch forces gcc to link its internal libraries
+ <para>This switch forces GCC to link its internal libraries
statically. We do this to avoid possible issues with the host
system.</para>
</listitem>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 2dccf00f6..0bbab725b 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -124,6 +124,14 @@ done</userinput></screen>
changes to the original files in case the command is inadvertently run twice.
</para>
+ <para>As in the first build of GCC it requires the GMP and MPFR packages.
+ Unpack the tarballs and move them into the required directory names:</para>
+
+<screen><userinput remap="pre">tar -jxf ../mpfr-&mpfr-version;.tar.bz2
+mv mpfr-&mpfr-version; mpfr
+tar -jxf ../gmp-&gmp-version;.tar.bz2
+mv gmp-&gmp-version; gmp</userinput></screen>
+
<para>Create a separate build directory again:</para>
<screen><userinput remap="pre">mkdir -v ../gcc-build