diff -r 4201b5881a7e -r a1370757e6a1 scripts/build/binutils/binutils.sh
--- a/scripts/build/binutils/binutils.sh	Tue Feb 09 22:50:53 2010 +0100
+++ b/scripts/build/binutils/binutils.sh	Wed Feb 17 23:47:47 2010 +0100
@@ -26,10 +26,8 @@
 
     # If GMP and MPFR were configured, then use that,
     # otherwise let binutils find the system-wide libraries, if they exist.
-    if [ "${CT_GMP_MPFR}" = "y" ]; then
-        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
-        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
-    fi
+    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
+    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
 
     CT_DoLog EXTRA "Configuring binutils"
     CFLAGS="${CT_CFLAGS_FOR_HOST}"                              \
@@ -86,7 +84,7 @@
     done
 
     # If GMP and MPFR were configured, then use that
-    if [ "${CT_BINUTILS_TARGET_USE_GMP_MPFR}" = "y" ]; then
+    if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
         extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr")
         extra_config+=("--with-mpfr=${CT_SYSROOT_DIR}/usr")
     fi