diff -r bcd33fce4db9 -r eb837be50f8f scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Thu Aug 05 18:19:07 2010 +0200
+++ b/scripts/build/cc/gcc.sh	Sun Sep 12 20:54:54 2010 +0200
@@ -169,12 +169,14 @@
         extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}")
     fi
-    if [ "${CT_CC_GCC_USE_PPL_CLOOG}" = "y" ]; then
+    if [ "${CT_CC_GCC_USE_MPC}" = "y" ]; then
+        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
+    fi
+    if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then
         extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
     fi
-    if [ "${CT_CC_GCC_USE_MPC_LIBELF}" = "y" ]; then
-        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
+    if [ "${CT_CC_GCC_USE_LTO}" = "y" ]; then
         extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
     fi
 
@@ -365,12 +367,14 @@
         extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}")
     fi
-    if [ "${CT_CC_GCC_USE_PPL_CLOOG}" = "y" ]; then
+    if [ "${CT_CC_GCC_USE_MPC}" = "y" ]; then
+        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
+    fi
+    if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then
         extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}")
         extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
     fi
-    if [ "${CT_CC_GCC_USE_MPC_LIBELF}" = "y" ]; then
-        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
+    if [ "${CT_CC_GCC_USE_LTO}" = "y" ]; then
         extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
     fi