1.1 --- a/scripts/build/binutils/binutils.sh	Tue Feb 09 22:50:53 2010 +0100
     1.2 +++ b/scripts/build/binutils/binutils.sh	Wed Feb 17 23:47:47 2010 +0100
     1.3 @@ -26,10 +26,8 @@
     1.4  
     1.5      # If GMP and MPFR were configured, then use that,
     1.6      # otherwise let binutils find the system-wide libraries, if they exist.
     1.7 -    if [ "${CT_GMP_MPFR}" = "y" ]; then
     1.8 -        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
     1.9 -        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    1.10 -    fi
    1.11 +    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    1.12 +    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    1.13  
    1.14      CT_DoLog EXTRA "Configuring binutils"
    1.15      CFLAGS="${CT_CFLAGS_FOR_HOST}"                              \
    1.16 @@ -86,7 +84,7 @@
    1.17      done
    1.18  
    1.19      # If GMP and MPFR were configured, then use that
    1.20 -    if [ "${CT_BINUTILS_TARGET_USE_GMP_MPFR}" = "y" ]; then
    1.21 +    if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
    1.22          extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr")
    1.23          extra_config+=("--with-mpfr=${CT_SYSROOT_DIR}/usr")
    1.24      fi