Changeset 01ffc23 for chapter05/gcc-pass2.xml

Timestamp:

05/16/2019 06:29:32 AM (5 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

4a8482f

Parents:

8c5e7286

Message:

Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11606 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter05/gcc-pass2.xml (modified) (2 diffs)

chapter05/gcc-pass2.xml

@@ -140 +140 @@
     <para>Now prepare GCC for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">CC=$LFS_TGT-gcc                                    \
-CXX=$LFS_TGT-g++                                   \
-AR=$LFS_TGT-ar                                     \
-RANLIB=$LFS_TGT-ranlib                             \
-../configure                                       \
-    --prefix=/tools                                \
-    --with-local-prefix=/tools                     \
-    --with-native-system-header-dir=/tools/include \
-    --enable-languages=c,c++                       \
-    --disable-libstdcxx-pch                        \
-    --disable-multilib                             \
-    --disable-bootstrap                            \
-    --disable-libgomp</userinput></screen>
-
-<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">mlist="m64"</userinput>
-<userinput arch="ml_32,ml_all" remap="configure">mlist="$mlist,m32"</userinput>
-<userinput arch="ml_x32,ml_all" remap="configure">mlist="$mlist,mx32"</userinput>
+<screen><userinput arch="default" remap="configure">mloptions="--disable-multilib"</userinput>
+<userinput arch="ml_32,ml_x32,ml_all" remap="configure">mloptions="--with-system-zlib --enable-multilib --with-multilib-list=m64"</userinput>
+<userinput arch="ml_32,ml_all" remap="configure">mloptions="$mloptions,m32"</userinput>
+<userinput arch="ml_x32,ml_all" remap="configure">mloptions="$mloptions,mx32"</userinput>
 <userinput remap="configure">CC=$LFS_TGT-gcc                                    \
 CXX=$LFS_TGT-g++                                   \
@@ -167 +154 @@
     --enable-languages=c,c++                       \
     --disable-libstdcxx-pch                        \
-    --enable-multilib                              \
-    --with-multilib-list=$mlist                    \
-    --with-system-zlib                             \
     --disable-bootstrap                            \
-    --disable-libgomp</userinput></screen>
+    --disable-libgomp                              \
+    $mloptions</userinput></screen>
 
     <variablelist>