diff -r 5416f4ba36bf -r 48c12c696778 scripts/build/companion_libs/gmp.sh
--- a/scripts/build/companion_libs/gmp.sh	Sun May 03 21:10:15 2009 +0000
+++ b/scripts/build/companion_libs/gmp.sh	Tue May 05 22:04:20 2009 +0000
@@ -22,20 +22,32 @@
 }
 
 do_gmp() {
+    local opts
+    local cflags
+
     mkdir -p "${CT_BUILD_DIR}/build-gmp"
     cd "${CT_BUILD_DIR}/build-gmp"
 
     CT_DoStep INFO "Installing GMP"
 
     CT_DoLog EXTRA "Configuring GMP"
-    CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
+
+    if [ "${CT_PPL_CLOOG}" = "y" ]; then
+        opts="--enable-cxx"
+        cflags="-fexceptions"
+    fi
+
+    CFLAGS="${CT_CFLAGS_FOR_HOST} ${cflags}"        \
     CT_DoExecLog ALL                                \
     "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
         --build=${CT_BUILD}                         \
         --host=${CT_HOST}                           \
         --prefix="${CT_PREFIX_DIR}"                 \
-        --disable-shared --enable-static            \
-        --enable-fft --enable-mpbsd
+        --disable-shared                            \
+        --enable-static                             \
+        --enable-fft                                \
+        --enable-mpbsd                              \
+        ${opts}
 
     CT_DoLog EXTRA "Building GMP"
     CT_DoExecLog ALL make ${PARALLELMFLAGS}
@@ -66,8 +78,10 @@
         --build=${CT_BUILD}                         \
         --host=${CT_TARGET}                         \
         --prefix=/usr                               \
-        --disable-shared --enable-static            \
-        --enable-fft --enable-mpbsd
+        --disable-shared                            \
+        --enable-static                             \
+        --enable-fft                                \
+        --enable-mpbsd                              \
 
     CT_DoLog EXTRA "Building GMP"
     CT_DoExecLog ALL make ${PARALLELMFLAGS}