aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2010-09-06 19:01:49 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2010-09-06 19:01:49 +0000
commitbd7123bffdefc435c9d5c8e03e72a7b8e82521b0 (patch)
tree156ed79b99c9bd9c49557ca3c32c8034361f7480
parentc19d13c7bfffd6f3bb6382f28f8a84107b80905a (diff)
Use --disable-libgomp instead of altering LD_LIBRARY_PATH in GCC pass 2.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9373 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter05/gcc-pass2.xml4
-rw-r--r--general.ent4
3 files changed, 15 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 350f1ec96..ab936f337 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,17 @@
-->
<listitem>
+ <para>2010-09-06</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Use --disable-libgomp instead of using
+ LD_LIBRARY_PATH to avoid a failure in GCC pass 2's configure
+ script.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2010-09-03</para>
<itemizedlist>
<listitem>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 635acec5f..e191e7b84 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -156,7 +156,7 @@ cd ../gcc-build</userinput></screen>
--enable-shared --enable-threads=posix \
--enable-__cxa_atexit --enable-languages=c,c++ \
--disable-libstdcxx-pch --disable-multilib \
- --disable-bootstrap \
+ --disable-bootstrap --disable-libgomp \
--with-gmp-include=$(pwd)/gmp --with-gmp-lib=$(pwd)/gmp/.libs \
--without-ppl --without-cloog</userinput></screen>
@@ -231,7 +231,7 @@ cd ../gcc-build</userinput></screen>
<para>Compile the package:</para>
-<screen><userinput remap="make">make LD_LIBRARY_PATH=$(pwd)/$(../gcc-&gcc-version;/config.guess)/libgcc</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
<para>Install the package:</para>
diff --git a/general.ent b/general.ent
index 3a1874d50..a8cafbb47 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100903">
-<!ENTITY releasedate "September 3, 2010">
+<!ENTITY version "SVN-20100906">
+<!ENTITY releasedate "September 6, 2010">
<!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "6.7">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->