1.1 --- a/scripts/build/cc_gcc.sh	Fri Jun 27 11:18:02 2008 +0000
     1.2 +++ b/scripts/build/cc_gcc.sh	Sun Jul 13 10:32:38 2008 +0000
     1.3 @@ -59,7 +59,7 @@
     1.4      CT_DoLog EXTRA "Configuring static core C compiler"
     1.5  
     1.6      extra_config="${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}"
     1.7 -    [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
     1.8 +    [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
     1.9      if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then
    1.10          extra_config="${extra_config} --enable-__cxa_atexit"
    1.11      else
    1.12 @@ -118,7 +118,7 @@
    1.13      CT_DoLog EXTRA "Configuring shared core C compiler"
    1.14  
    1.15      extra_config="${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}"
    1.16 -    [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
    1.17 +    [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
    1.18      if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then
    1.19          extra_config="${extra_config} --enable-__cxa_atexit"
    1.20      else
    1.21 @@ -224,7 +224,7 @@
    1.22      extra_config="${extra_config} --disable-multilib"
    1.23      extra_config="${extra_config} ${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}"
    1.24      [ "${CT_SHARED_LIBS}" = "y" ]     || extra_config="${extra_config} --disable-shared"
    1.25 -    [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
    1.26 +    [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
    1.27      [ -n "${CT_CC_PKGVERSION}" ]      && extra_config="${extra_config} --with-pkgversion=${CT_CC_PKGVERSION}"
    1.28      [ -n "${CT_CC_BUGURL}" ]          && extra_config="${extra_config} --with-bugurl=${CT_CC_BUGURL}"
    1.29      if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then