aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2010-08-03 20:00:28 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2010-08-03 20:00:28 +0000
commit6123afebc7ecf149d8455d84b989cfc2396b181b (patch)
treef6f3991a77903ec18ea35954a5de6e3f6962f1df
parentc644cae75cb16255770d950b64dcb993ed83f990 (diff)
Add parameters to prevent chapter 5 GCC builds linking to the host's copy of CLooG and PPL. Fixes #2723.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9349 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml6
-rw-r--r--chapter05/gcc-pass1.xml12
-rw-r--r--chapter05/gcc-pass2.xml3
3 files changed, 19 insertions, 2 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index acdfd19f7..8a52d8c96 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,12 @@
<para>2010-08-03</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Add parameters to prevent chapter 5 GCC builds
+ from linking to the host system's CLooG and PPL libraries that will
+ not be present in chapter 6. Fixes
+ <ulink url="&lfs-ticket-root;2723">#2723</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to Linux-2.6.35. Fixes
<ulink url="&lfs-ticket-root;2728">#2728</ulink>.</para>
</listitem>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index c15c95fd2..930f0405e 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -68,7 +68,8 @@ cd ../gcc-build</userinput></screen>
--disable-decimal-float --disable-threads \
--disable-libmudflap --disable-libssp \
--disable-libgomp --enable-languages=c \
- --with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs</userinput></screen>
+ --with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs \
+ --without-ppl --without-cloog</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -122,6 +123,15 @@ cd ../gcc-build</userinput></screen>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>--without-ppl, --without-cloog</parameter></term>
+ <listitem>
+ <para>These switches prevent GCC from building against the PPL and
+ CLooG libraries which may be present on the host system, but will not
+ be available in the chroot environment.</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
<para>Compile GCC by running:</para>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index ba9a96900..635acec5f 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -157,7 +157,8 @@ cd ../gcc-build</userinput></screen>
--enable-__cxa_atexit --enable-languages=c,c++ \
--disable-libstdcxx-pch --disable-multilib \
--disable-bootstrap \
- --with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs</userinput></screen>
+ --with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs \
+ --without-ppl --without-cloog</userinput></screen>
<variablelist>
<title>The meaning of the new configure options:</title>