Changeset 03e6a40 for BOOK/cross-tools/common/binutils-32.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/cross-tools/common/binutils-32.xml (modified) (4 diffs)

BOOK/cross-tools/common/binutils-32.xml

@@ -83 +83 @@
 
       <varlistentry os="bd4">
+        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
+        <listitem>
+          <para>Tells configure to build a linker that uses ${CLFS} as its
+          root directory for its search paths.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="bd5">
         <term><parameter>--with-lib-path=/tools/lib</parameter></term>
         <listitem>
@@ -93 +101 @@
       </varlistentry>
 
-      <varlistentry os="bd5">
+      <varlistentry os="bd6">
         <term><parameter>--disable-nls</parameter></term>
         <listitem>
@@ -101 +109 @@
       </varlistentry>
 
-      <varlistentry os="bd6">
+      <varlistentry os="bd7">
         <term><parameter>--disable-multilib</parameter></term>
         <listitem>
@@ -113 +121 @@
     <para os="be">Compile the package:</para>
 
-<screen os="bf"><userinput>make configure-host
-make</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the make options:</title>
-
-      <varlistentry os="bg1">
-        <term><parameter>configure-host</parameter></term>
-        <listitem>
-          <para>This checks the host environment and makes sure all the
-          necessary tools are available to compile Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen os="bf"><userinput>make</userinput></screen>
 
     <para os="bh">Install the package:</para>
 
 <screen os="bi"><userinput>make install</userinput></screen>
-
-    <para os="bj">Copy <filename class="headerfile">libiberty.h</filename> to
-    <filename class="directory">/tools/include</filename> directory:</para>
-
-<screen os="bk"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /tools/include</userinput></screen>
 
   </sect2>