aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2013-02-26 20:30:24 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2013-02-26 20:30:24 +0000
commitf0f41404fd5da28c2c1ba9839b81f2160c8fb246 (patch)
tree453719b262753487ec5e67637b6eb466a5f1c97b /chapter05
parent69f85d4661be4d390afc05e0fc902147715b9db0 (diff)
Merge latest changes from trunk to systemd branch
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10171 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/gcc-pass1.xml5
-rw-r--r--chapter05/gcc-pass2.xml5
2 files changed, 10 insertions, 0 deletions
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index b7f97a386..bf8076d1b 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -105,6 +105,11 @@ done</userinput></screen>
<screen><userinput remap="pre">sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure</userinput></screen>
+ <para>Do not build the .info files. They are not needed here and
+ are broken with the current version of <command>makeinfo</command>.</para>
+
+<screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
+
<para>The GCC documentation recommends building GCC outside of the
source directory in a dedicated build directory:</para>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6c936debc..6e7631741 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -97,6 +97,11 @@ mv -v gmp-&gmp-version; gmp
tar -zxf ../mpc-&mpc-version;.tar.gz
mv -v mpc-&mpc-version; mpc</userinput></screen>
+ <para>Again, do not build the .info files. They are not needed here and
+ are broken with the current version of <command>makeinfo</command>.</para>
+
+ <screen><userinput remap="pre">sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure</userinput></screen>
+
<para>Create a separate build directory again:</para>
<screen><userinput remap="pre">mkdir -v ../gcc-build