1.1 --- a/scripts/build/cc/gcc.sh	Wed Feb 17 23:47:47 2010 +0100
     1.2 +++ b/scripts/build/cc/gcc.sh	Fri Mar 05 18:55:25 2010 +0100
     1.3 @@ -150,11 +150,15 @@
     1.4      else
     1.5          extra_config+=("--disable-__cxa_atexit")
     1.6      fi
     1.7 -    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
     1.8 -    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
     1.9 -    [ -z "${CT_PPL}"    ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    1.10 -    [ -z "${CT_CLOOG}"  ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    1.11 -    [ -z "${CT_MPC}"    ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    1.12 +    if [ "${CT_GCC_USE_GMP_MPFR}" = "y" ]; then
    1.13 +        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    1.14 +        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    1.15 +    fi
    1.16 +    if [ "${CT_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
    1.17 +        extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    1.18 +        extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    1.19 +        extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    1.20 +    fi
    1.21  
    1.22      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    1.23  
    1.24 @@ -299,11 +303,15 @@
    1.25      if [ -n "${CC_ENABLE_CXX_FLAGS}" ]; then
    1.26          extra_config+=("--enable-cxx-flags=${CC_ENABLE_CXX_FLAGS}")
    1.27      fi
    1.28 -    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    1.29 -    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    1.30 -    [ -z "${CT_PPL}"    ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    1.31 -    [ -z "${CT_CLOOG}"  ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    1.32 -    [ -z "${CT_MPC}"    ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    1.33 +    if [ "${CT_GCC_USE_GMP_MPFR}" = "y" ]; then
    1.34 +        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    1.35 +        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    1.36 +    fi
    1.37 +    if [ "${CT_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
    1.38 +        extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    1.39 +        extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    1.40 +        extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    1.41 +    fi
    1.42  
    1.43      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    1.44