diff -r ad34196543eb -r 46658e3fc781 scripts/build/companion_libs/gmp.sh
--- a/scripts/build/companion_libs/gmp.sh	Sun May 24 21:59:08 2009 +0000
+++ b/scripts/build/companion_libs/gmp.sh	Mon May 25 17:26:21 2009 +0000
@@ -22,8 +22,6 @@
 }
 
 do_gmp() {
-    local opts
-    local cflags
 
     mkdir -p "${CT_BUILD_DIR}/build-gmp"
     cd "${CT_BUILD_DIR}/build-gmp"
@@ -32,12 +30,7 @@
 
     CT_DoLog EXTRA "Configuring GMP"
 
-    if [ "${CT_PPL_CLOOG}" = "y" ]; then
-        opts="--enable-cxx"
-        cflags="-fexceptions"
-    fi
-
-    CFLAGS="${CT_CFLAGS_FOR_HOST} ${cflags}"        \
+    CFLAGS="${CT_CFLAGS_FOR_HOST} -fexceptions"     \
     CT_DoExecLog ALL                                \
     "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
         --build=${CT_BUILD}                         \
@@ -47,7 +40,7 @@
         --disable-static                            \
         --enable-fft                                \
         --enable-mpbsd                              \
-        ${opts}
+        --enable-cxx
 
     CT_DoLog EXTRA "Building GMP"
     CT_DoExecLog ALL make ${PARALLELMFLAGS}