1.1 --- a/scripts/build/cc/gcc.sh	Wed Aug 19 19:44:45 2009 +0200
     1.2 +++ b/scripts/build/cc/gcc.sh	Wed Feb 17 23:47:47 2010 +0100
     1.3 @@ -150,15 +150,11 @@
     1.4      else
     1.5          extra_config+=("--disable-__cxa_atexit")
     1.6      fi
     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 -    if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then
    1.12 -        extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    1.13 -        extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    1.14 -        extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    1.15 -    fi
    1.16 +    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    1.17 +    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    1.18 +    [ -z "${CT_PPL}"    ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    1.19 +    [ -z "${CT_CLOOG}"  ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    1.20 +    [ -z "${CT_MPC}"    ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    1.21  
    1.22      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    1.23  
    1.24 @@ -300,18 +296,14 @@
    1.25      else
    1.26          extra_config+=("--disable-__cxa_atexit")
    1.27      fi
    1.28 -    if [ "${CT_GMP_MPFR}" = "y" ]; then
    1.29 -        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    1.30 -        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    1.31 -    fi
    1.32 -    if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then
    1.33 -        extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    1.34 -        extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    1.35 -        extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    1.36 -    fi
    1.37      if [ -n "${CC_ENABLE_CXX_FLAGS}" ]; then
    1.38          extra_config+=("--enable-cxx-flags=${CC_ENABLE_CXX_FLAGS}")
    1.39      fi
    1.40 +    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    1.41 +    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    1.42 +    [ -z "${CT_PPL}"    ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    1.43 +    [ -z "${CT_CLOOG}"  ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    1.44 +    [ -z "${CT_MPC}"    ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    1.45  
    1.46      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    1.47