[Clfs-commits] commit: r4057 - in /trunk/BOOK/final-system: mips64/gmp-64bit.xml multilib/gmp-64bit.xml multilib/gmp-n32.xml multilib/gmp.xml

[svn at cross-lfs.org]

Author: jciccone
Date: Mon Oct 20 22:59:21 2008
New Revision: 4057

Log:
Add CXX= to GMP Multilib.

Modified:
    trunk/BOOK/final-system/mips64/gmp-64bit.xml
    trunk/BOOK/final-system/multilib/gmp-64bit.xml
    trunk/BOOK/final-system/multilib/gmp-n32.xml
    trunk/BOOK/final-system/multilib/gmp.xml

Modified: trunk/BOOK/final-system/mips64/gmp-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/mips64/gmp-64bit.xml (original)
+++ trunk/BOOK/final-system/mips64/gmp-64bit.xml Mon Oct 20 22:59:21 2008
@@ -25,9 +25,9 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --enable-cxx \
-    --enable-mpbsd</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/gmp-64bit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gmp.xml"

Modified: trunk/BOOK/final-system/multilib/gmp-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/gmp-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/gmp-64bit.xml Mon Oct 20 22:59:21 2008
@@ -25,7 +25,8 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+    ./configure --prefix=/usr \
     --libdir=/usr/lib64 --enable-cxx \
     --enable-mpbsd</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/gmp-n32.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/gmp-n32.xml (original)
+++ trunk/BOOK/final-system/multilib/gmp-n32.xml Mon Oct 20 22:59:21 2008
@@ -26,7 +26,8 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+    ./configure --prefix=/usr \
     --libdir=/usr/lib32 --enable-cxx \
     --enable-mpbsd</userinput></screen>
 

Modified: trunk/BOOK/final-system/multilib/gmp.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/gmp.xml (original)
+++ trunk/BOOK/final-system/multilib/gmp.xml Mon Oct 20 22:59:21 2008
@@ -26,7 +26,8 @@
     href="../common/gmp.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+    ./configure --prefix=/usr \
     --host=${CLFS_TARGET32} --enable-cxx \
     --enable-mpbsd</userinput></screen>