1.1 --- a/scripts/build/cc/gcc.sh	Mon May 25 20:09:17 2009 +0000
     1.2 +++ b/scripts/build/cc/gcc.sh	Wed May 27 21:16:01 2009 +0000
     1.3 @@ -132,12 +132,20 @@
     1.4      extra_config="${extra_config} ${CT_ARCH_WITH_TUNE}"
     1.5      extra_config="${extra_config} ${CT_ARCH_WITH_FPU}"
     1.6      extra_config="${extra_config} ${CT_ARCH_WITH_FLOAT}"
     1.7 -    [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
     1.8      if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then
     1.9          extra_config="${extra_config} --enable-__cxa_atexit"
    1.10      else
    1.11          extra_config="${extra_config} --disable-__cxa_atexit"
    1.12      fi
    1.13 +    if [ "${CT_GMP_MPFR}" = "y" ]; then
    1.14 +        extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR}"
    1.15 +        extra_config="${extra_config} --with-mpfr=${CT_PREFIX_DIR}"
    1.16 +    fi
    1.17 +    if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then
    1.18 +        extra_config="${extra_config} --with-ppl=${CT_PREFIX_DIR}"
    1.19 +        extra_config="${extra_config} --with-cloog=${CT_PREFIX_DIR}"
    1.20 +        extra_config="${extra_config} --with-mpc=${CT_PREFIX_DIR}"
    1.21 +    fi
    1.22  
    1.23      CT_DoLog DEBUG "Extra config passed: '${extra_config}'"
    1.24  
    1.25 @@ -266,7 +274,6 @@
    1.26      extra_config="${extra_config} ${CT_ARCH_WITH_FPU}"
    1.27      extra_config="${extra_config} ${CT_ARCH_WITH_FLOAT}"
    1.28      [ "${CT_SHARED_LIBS}" = "y" ]                   || extra_config="${extra_config} --disable-shared"
    1.29 -    [ "${CT_GMP_MPFR}" = "y" ]                      && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
    1.30      [ -n "${CT_CC_PKGVERSION}" ]                    && extra_config="${extra_config} --with-pkgversion=${CT_CC_PKGVERSION}"
    1.31      [ -n "${CT_CC_BUGURL}" ]                        && extra_config="${extra_config} --with-bugurl=${CT_CC_BUGURL}"
    1.32      [ "${CT_CC_SJLJ_EXCEPTIONS_USE}" = "y" ]        && extra_config="${extra_config} --enable-sjlj-exceptions"
    1.33 @@ -276,6 +283,15 @@
    1.34      else
    1.35          extra_config="${extra_config} --disable-__cxa_atexit"
    1.36      fi
    1.37 +    if [ "${CT_GMP_MPFR}" = "y" ]; then
    1.38 +        extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR}"
    1.39 +        extra_config="${extra_config} --with-mpfr=${CT_PREFIX_DIR}"
    1.40 +    fi
    1.41 +    if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then
    1.42 +        extra_config="${extra_config} --with-ppl=${CT_PREFIX_DIR}"
    1.43 +        extra_config="${extra_config} --with-cloog=${CT_PREFIX_DIR}"
    1.44 +        extra_config="${extra_config} --with-mpc=${CT_PREFIX_DIR}"
    1.45 +    fi
    1.46  
    1.47      CT_DoLog DEBUG "Extra config passed: '${extra_config}'"
    1.48