--- branches/magellan-next/core/gmp/gmp-5.0.1-r1.smage2	2010/08/16 19:15:17	5820
+++ branches/magellan-next/core/gmp/gmp-5.0.1-r1.smage2	2010/08/16 19:41:59	5821
@@ -17,7 +17,7 @@
 SRCFILE="${PNAME}-${PVER}.tar.bz2"
 SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
 
-# not mutilib.sminc compat, don't use it!
+# not multilib.sminc compat, don't use it!
 sminclude mbuild
 
 SRC_URI=(
@@ -31,6 +31,10 @@
 {
 	install -d ${SRCDIR}/build
 	cd ${SRCDIR}/build
+	CPPFLAGS="-fexecptions" \
+	CC="gcc -m64 -isystem /usr/include" \
+	CXX="g++ -m64 -isystem /usr/include" \
+	LDFLAGS="-Wl,-rpath-link,/lib -m64" \
 	../configure \
 		--host=${CHOST} \
 		--prefix=/usr \
@@ -38,6 +42,7 @@
 		--infodir=/usr/share/info \
 		--libdir=/usr/$(mlibdir) \
 		--enable-mpbsd \
+		--enable-cxx \
 		|| die
 	mmake || die
 
@@ -46,7 +51,11 @@
 	then
 		install -d ${SRCDIR}/build-m32
 		cd ${SRCDIR}/build-m32
-		ABI=32 CC="gcc -m32" \
+		CPPFLAGS="-fexecptions" \
+		ABI=32 \
+		CC="gcc -m32 -isystem /usr/include" \
+		CXX="g++ -m32 -isystem /usr/include" \
+		LDFLAGS="-Wl,-rpath-link,/lib -m32" \
 		../configure \
 			--host=${CHOST} \
 			--prefix=/usr \
@@ -54,6 +63,7 @@
 			--infodir=/usr/share/info \
 			--libdir=/usr/lib \
 			--enable-mpbsd \
+			--enable-cxx \
 			|| die
 		mmake || die
 	fi