Changeset 01ffc23 for chapter05/gcc-pass1.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-pass1.xml (modified) (3 diffs)

chapter05/gcc-pass1.xml

@@ -156 +156 @@
     <para>Prepare GCC for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">../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++</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="--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">../configure                                       \
     --target=$LFS_TGT                              \
@@ -192 +171 @@
     --disable-nls                                  \
     --disable-shared                               \
-    --enable-multilib                              \
-    --with-multilib-list=$mlist                    \
     --disable-decimal-float                        \
     --disable-threads                              \
@@ -202 +179 @@
     --disable-libvtv                               \
     --disable-libstdcxx                            \
-    --enable-languages=c,c++</userinput></screen>
+    --enable-languages=c,c++                       \
+    $mloptions</userinput></screen>
 
     <variablelist>