1.1 --- a/config/cc/gcc.in	Fri Mar 05 18:22:53 2010 +0100
     1.2 +++ b/config/cc/gcc.in	Fri Mar 05 18:55:25 2010 +0100
     1.3 @@ -102,13 +102,23 @@
     1.4  config CC_GCC_4_3_or_later
     1.5      bool
     1.6      default n
     1.7 -    select GMP
     1.8 -    select MPFR
     1.9 +    select CC_GCC_USE_GMP_MPFR
    1.10  
    1.11  config CC_GCC_4_4_or_later
    1.12      bool
    1.13      default n
    1.14      select CC_GCC_4_3_or_later
    1.15 +    select CC_GCC_USE_PPL_CLOOG_MPC
    1.16 +
    1.17 +config CC_GCC_USE_GMP_MPFR
    1.18 +    bool
    1.19 +    default n
    1.20 +    select GMP
    1.21 +    select MPFR
    1.22 +
    1.23 +config CC_GCC_USE_PPL_CLOOG_MPC
    1.24 +    bool
    1.25 +    default n
    1.26      select PPL
    1.27      select CLOOG
    1.28      select MPC

     2.1 --- a/scripts/build/cc/gcc.sh	Fri Mar 05 18:22:53 2010 +0100
     2.2 +++ b/scripts/build/cc/gcc.sh	Fri Mar 05 18:55:25 2010 +0100
     2.3 @@ -150,11 +150,15 @@
     2.4      else
     2.5          extra_config+=("--disable-__cxa_atexit")
     2.6      fi
     2.7 -    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
     2.8 -    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
     2.9 -    [ -z "${CT_PPL}"    ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    2.10 -    [ -z "${CT_CLOOG}"  ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    2.11 -    [ -z "${CT_MPC}"    ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    2.12 +    if [ "${CT_GCC_USE_GMP_MPFR}" = "y" ]; then
    2.13 +        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    2.14 +        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    2.15 +    fi
    2.16 +    if [ "${CT_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
    2.17 +        extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    2.18 +        extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    2.19 +        extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    2.20 +    fi
    2.21  
    2.22      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    2.23  
    2.24 @@ -299,11 +303,15 @@
    2.25      if [ -n "${CC_ENABLE_CXX_FLAGS}" ]; then
    2.26          extra_config+=("--enable-cxx-flags=${CC_ENABLE_CXX_FLAGS}")
    2.27      fi
    2.28 -    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    2.29 -    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    2.30 -    [ -z "${CT_PPL}"    ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    2.31 -    [ -z "${CT_CLOOG}"  ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    2.32 -    [ -z "${CT_MPC}"    ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    2.33 +    if [ "${CT_GCC_USE_GMP_MPFR}" = "y" ]; then
    2.34 +        extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
    2.35 +        extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
    2.36 +    fi
    2.37 +    if [ "${CT_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
    2.38 +        extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
    2.39 +        extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
    2.40 +        extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
    2.41 +    fi
    2.42  
    2.43      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    2.44