From 6123afebc7ecf149d8455d84b989cfc2396b181b Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Tue, 3 Aug 2010 20:00:28 +0000
Subject: 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
---
 chapter05/gcc-pass1.xml | 12 +++++++++++-
 chapter05/gcc-pass2.xml |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'chapter05')

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>
-- 
cgit v1.2.3-54-g00ecf