diff -r a1370757e6a1 -r 3f54c8d7f3f9 scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Wed Feb 17 23:47:47 2010 +0100
+++ b/scripts/build/cc/gcc.sh	Fri Mar 05 18:55:25 2010 +0100
@@ -150,11 +150,15 @@
     else
         extra_config+=("--disable-__cxa_atexit")
     fi
-    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
-    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
-    [ -z "${CT_PPL}"    ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
-    [ -z "${CT_CLOOG}"  ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
-    [ -z "${CT_MPC}"    ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
+    if [ "${CT_GCC_USE_GMP_MPFR}" = "y" ]; then
+        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
+        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
+    fi
+    if [ "${CT_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
+        extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
+        extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
+        extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
+    fi
 
     CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
 
@@ -299,11 +303,15 @@
     if [ -n "${CC_ENABLE_CXX_FLAGS}" ]; then
         extra_config+=("--enable-cxx-flags=${CC_ENABLE_CXX_FLAGS}")
     fi
-    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
-    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
-    [ -z "${CT_PPL}"    ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
-    [ -z "${CT_CLOOG}"  ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
-    [ -z "${CT_MPC}"    ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
+    if [ "${CT_GCC_USE_GMP_MPFR}" = "y" ]; then
+        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
+        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
+    fi
+    if [ "${CT_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
+        extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
+        extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
+        extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
+    fi
 
     CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"