Changeset 026bb5d for BOOK/final-system/multilib/binutils.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

File:

• BOOK/final-system/multilib/binutils.xml (modified) (2 diffs)

BOOK/final-system/multilib/binutils.xml

@@ -42 +42 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
+<!-- Branch update patch area
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+-->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
@@ -56 +65 @@
 <screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib ${BUILD64}" \
-  ../binutils-&binutils-version;/configure --prefix=/usr \
+  ../binutils-&binutils-dir;/configure --prefix=/usr \
     --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>