Changeset f10d150

Timestamp:

Aug 8, 2010, 2:02:10 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

41969c7

Parents:

c8d4414

Message:

We no longer need to override MULTIOSDIR for binutils on pure64. We got rid of the multilib /tools a LONG time ago.

Location:

BOOK/final-system

Files:

• 64/binutils.xml (modified) (1 diff)
• x86_64-64/binutils.xml (modified) (1 diff)

BOOK/final-system/64/binutils.xml

@@ -41 +41 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="q1">Libiberty uses
-    <command>gcc -print-multi-os-directory</command> to determine where to
-    install <filename class="libraryfile">libiberty.a</filename>. Because our
-    temporary GCC is still multilib-aware, the command returns
-    <literal>../lib64</literal> which causes the archive to be installed into
-    <filename class="directory">/usr/lib64</filename>.  The following sed will
-    prevent this:</para>
-
-<screen os="q2"><userinput>sed -i 's%\(^MULTIOSDIR = \).*%\1 ../lib%' libiberty/Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/x86_64-64/binutils.xml

@@ -41 +41 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@os='q1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@os='q2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"