aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/chapter05.xml1
-rw-r--r--chapter05/gcc-pass1.xml24
-rw-r--r--chapter05/gcc-pass2.xml1
3 files changed, 18 insertions, 8 deletions
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index d6a977d48..d858c9a98 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -18,6 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-pass1.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils-pass2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-pass2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index bf8076d1b..ca4f4defe 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -131,11 +131,15 @@ cd ../gcc-build</userinput></screen>
--disable-multilib \
--disable-decimal-float \
--disable-threads \
- --disable-libmudflap \
- --disable-libssp \
+ --disable-libatomic \
--disable-libgomp \
+ --disable-libitm \
+ --disable-libmudflap \
--disable-libquadmath \
- --enable-languages=c \
+ --disable-libsanitizer \
+ --disable-libssp \
+ --disable-libstdc++-v3 \
+ --enable-languages=c,c++ \
--with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
--with-mpfr-lib=$(pwd)/mpfr/src/.libs</userinput></screen>
@@ -193,10 +197,14 @@ cd ../gcc-build</userinput></screen>
</varlistentry>
<varlistentry>
- <term><parameter>--disable-decimal-float, --disable-threads, --disable-libmudflap, --disable-libssp, --disable-libgomp, --disable-libquadmath</parameter></term>
+ <term><parameter>--disable-decimal-float, --disable-threads,
+ --disable-libatomic, --disable-libgomp, --disable-libitm,
+ --disable-libmudflap, --disable-libquadmath, --disable-libsanitizer,
+ --disable-libssp, --disable-libstdc++-v3</parameter></term>
<listitem>
<para>These switches disable support for the decimal floating point
- extension, threading, libmudflap, libssp and libgomp and libquadmath
+ extension, threading, libatomic, libgomp, libitm, libmudflap,
+ libquadmath, libsanitizer, libssp and the C++ standard library
respectively. These features will fail to compile when building a
cross-compiler and are not necessary for the task of cross-compiling
the temporary libc.</para>
@@ -212,10 +220,10 @@ cd ../gcc-build</userinput></screen>
</varlistentry>
<varlistentry>
- <term><parameter>--enable-languages=c</parameter></term>
+ <term><parameter>--enable-languages=c,c++</parameter></term>
<listitem>
- <para>This option ensures that only the C compiler is built.
- This is the only language needed now.</para>
+ <para>This option ensures that only the C and C++ compilers are built.
+ These are the only languages needed now.</para>
</listitem>
</varlistentry>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6e7631741..7ca724ce9 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -113,6 +113,7 @@ cd ../gcc-build</userinput></screen>
<para>Now prepare GCC for compilation:</para>
<screen><userinput remap="configure">CC=$LFS_TGT-gcc \
+CXX=$LFS_TGT-g++ \
AR=$LFS_TGT-ar \
RANLIB=$LFS_TGT-ranlib \
../gcc-&gcc-version;/configure \