Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml (revision 8c5e7286941bdcff21be0e42d59ffba4a7afdf8b)
+++ chapter05/gcc-pass1.xml (revision 01ffc239f0d5717676f76998538b660f4aa89ba0)
@@ -156,29 +156,8 @@
Prepare GCC for compilation:
-../configure \
- --target=$LFS_TGT \
- --prefix=/tools \
- --with-glibc-version=2.11 \
- --with-sysroot=$LFS \
- --with-newlib \
- --without-headers \
- --with-local-prefix=/tools \
- --with-native-system-header-dir=/tools/include \
- --disable-nls \
- --disable-shared \
- --disable-multilib \
- --disable-decimal-float \
- --disable-threads \
- --disable-libatomic \
- --disable-libgomp \
- --disable-libquadmath \
- --disable-libssp \
- --disable-libvtv \
- --disable-libstdcxx \
- --enable-languages=c,c++
-
-mlist="m64"
-mlist="$mlist,m32"
-mlist="$mlist,mx32"
+mloptions="--disable-multilib"
+mloptions="--enable-multilib --with-multilib-list=m64"
+mloptions="$mloptions,m32"
+mloptions="$mloptions,mx32"
../configure \
--target=$LFS_TGT \
@@ -192,6 +171,4 @@
--disable-nls \
--disable-shared \
- --enable-multilib \
- --with-multilib-list=$mlist \
--disable-decimal-float \
--disable-threads \
@@ -202,5 +179,6 @@
--disable-libvtv \
--disable-libstdcxx \
- --enable-languages=c,c++
+ --enable-languages=c,c++ \
+ $mloptions