Changeset 01ffc23 for chapter06/gcc.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:

• chapter06/gcc.xml (modified) (1 diff)

chapter06/gcc.xml

@@ -77 +77 @@
     <para>Prepare GCC for compilation:</para>
 
-<screen arch="default"><userinput remap="configure">SED=sed                               \
+<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">SED=sed                               \
 ../configure --prefix=/usr            \
              --enable-languages=c,c++ \
-             --disable-multilib       \
              --disable-bootstrap      \
-             --with-system-zlib</userinput></screen>
-<screen arch="ml_32"><userinput remap="configure">SED=sed                               \
-../configure --prefix=/usr                     \
-             --enable-languages=c,c++          \
-             --enable-multilib                 \
-             --with-multilib-list=m32,m64      \
-             --disable-bootstrap               \
-             --with-system-zlib</userinput></screen>
-<screen arch="ml_x32"><userinput remap="configure">SED=sed                               \
-../configure --prefix=/usr                     \
-             --enable-languages=c,c++          \
-             --enable-multilib                 \
-             --with-multilib-list=mx32,m64     \
-             --disable-bootstrap               \
-             --with-system-zlib</userinput></screen>
-<screen arch="ml_all"><userinput remap="configure">SED=sed                               \
-../configure --prefix=/usr                     \
-             --enable-languages=c,c++          \
-             --enable-multilib                 \
-             --with-multilib-list=m32,mx32,m64 \
-             --disable-bootstrap               \
-             --with-system-zlib</userinput></screen>
+             --with-system-zlib       \
+             $mloptions</userinput></screen>
 
     <para>Note that for other languages, there are some prerequisites that