1.1 --- a/scripts/build/cc_gcc.sh Mon Apr 28 07:44:22 2008 +0000
1.2 +++ b/scripts/build/cc_gcc.sh Wed Apr 30 10:43:41 2008 +0000
1.3 @@ -7,7 +7,7 @@
1.4 echo "gcc-${CT_CC_VERSION}"
1.5 }
1.6
1.7 -# Download final gcc
1.8 +# Download gcc
1.9 do_cc_get() {
1.10 # Ah! gcc folks are kind of 'different': they store the tarballs in
1.11 # subdirectories of the same name! That's because gcc is such /crap/ that
1.12 @@ -21,7 +21,7 @@
1.13 ftp://ftp.gnu.org/gnu/gcc
1.14 }
1.15
1.16 -# Extract final gcc
1.17 +# Extract gcc
1.18 do_cc_extract() {
1.19 CT_ExtractAndPatch "${CT_CC_FILE}"
1.20 }
1.21 @@ -62,6 +62,7 @@
1.22
1.23 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_CC_CXA_ATEXIT}" = "y" ] && extra_config="${extra_config} --enable-__cxa_atexit"
1.25 + [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
1.26
1.27 CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
1.28
1.29 @@ -114,6 +115,7 @@
1.30
1.31 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.32 [ "${CT_CC_CXA_ATEXIT}" = "y" ] && extra_config="${extra_config} --enable-__cxa_atexit"
1.33 + [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
1.34
1.35 CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
1.36
1.37 @@ -202,12 +204,10 @@
1.38 [ "${CT_CC_LANG_JAVA}" = "y" ] && lang_opt="${lang_opt},java"
1.39 [ "${CT_CC_LANG_OBJC}" = "y" ] && lang_opt="${lang_opt},objc"
1.40 [ "${CT_CC_LANG_OBJCXX}" = "y" ] && lang_opt="${lang_opt},obj-c++"
1.41 - CT_Test "Building Fortran language is not yet supported. Will try..." "${CT_CC_LANG_FORTRAN}" = "y"
1.42 CT_Test "Building ADA language is not yet supported. Will try..." "${CT_CC_LANG_ADA}" = "y"
1.43 - CT_Test "Building Java language is not yet supported. Will try..." "${CT_CC_LANG_JAVA}" = "y"
1.44 CT_Test "Building Objective-C language is not yet supported. Will try..." "${CT_CC_LANG_OBJC}" = "y"
1.45 CT_Test "Building Objective-C++ language is not yet supported. Will try..." "${CT_CC_LANG_OBJCXX}" = "y"
1.46 - CT_Test "Building ${CT_CC_LANG_OTHERS} language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}"
1.47 + CT_Test "Building ${CT_CC_LANG_OTHERS//,/ } language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}"
1.48 lang_opt=`echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;'`
1.49
1.50 extra_config="--enable-languages=${lang_opt}"
1.51 @@ -219,6 +219,7 @@
1.52 else
1.53 extra_config="${extra_config} --disable-multilib"
1.54 fi
1.55 + [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
1.56
1.57 CT_DoLog DEBUG "Extra config passed: \"${extra_config}\""
1.58