Changeset 03e6a40 for BOOK/temp-system/multilib/binutils.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/temp-system/multilib/binutils.xml (modified) (1 diff)

BOOK/temp-system/multilib/binutils.xml

@@ -49 +49 @@
     --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
-    <variablelist os="ea">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Tells the compiler to use our 64-bit build flags.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"