Changeset 43100c0 for BOOK/final-system/multilib/expat-64bit.xml

Timestamp:

Feb 3, 2014, 3:21:44 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

4340580

Parents:

849369d (diff), 961afdcd (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' of git.cross-lfs.org:cross-lfs into systemd

File:

• BOOK/final-system/multilib/expat-64bit.xml (modified) (2 diffs)

BOOK/final-system/multilib/expat-64bit.xml

@@ -26 +26 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
+    --prefix=/usr --libdir=/usr/lib64</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -40 +40 @@
     href="../common/expat.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/expat.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"