# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1215945158 0
# Node ID 8e58024f8e37674d14b4822974150ae27c54b411
# Parent  8c816e372384c744542cdef7c6c7c6b7316965d4
Ioannis E. VENETIS <venetis@mail.capsl.udel.edu> pointed out that GMP and MPFR were not used by gcc.
Turned out that none could use GMP and MPFR as the config option changed its name, but the change was not propagated to all users.

 /trunk/scripts/build/binutils.sh      |    2     1     1     0 +-
 /trunk/scripts/build/debug/300-gdb.sh |    2     1     1     0 +-
 /trunk/scripts/build/cc_gcc.sh        |    6     3     3     0 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff -r 8c816e372384 -r 8e58024f8e37 scripts/build/binutils.sh
--- a/scripts/build/binutils.sh	Wed Jul 09 21:13:07 2008 +0000
+++ b/scripts/build/binutils.sh	Sun Jul 13 10:32:38 2008 +0000
@@ -27,7 +27,7 @@
     binutils_opts=
     # If GMP and MPFR were configured, then use that,
     # otherwise let binutils find the system-wide libraries, if they exist.
-    if [ "${CT_CC_GCC_GMP_MPFR}" = "y" ]; then
+    if [ "${CT_GMP_MPFR}" = "y" ]; then
         binutils_opts="--with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
     fi
 
diff -r 8c816e372384 -r 8e58024f8e37 scripts/build/cc_gcc.sh
--- a/scripts/build/cc_gcc.sh	Wed Jul 09 21:13:07 2008 +0000
+++ b/scripts/build/cc_gcc.sh	Sun Jul 13 10:32:38 2008 +0000
@@ -59,7 +59,7 @@
     CT_DoLog EXTRA "Configuring static core C compiler"
 
     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}"
-    [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
+    [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
     if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then
         extra_config="${extra_config} --enable-__cxa_atexit"
     else
@@ -118,7 +118,7 @@
     CT_DoLog EXTRA "Configuring shared core C compiler"
 
     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}"
-    [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
+    [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
     if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then
         extra_config="${extra_config} --enable-__cxa_atexit"
     else
@@ -224,7 +224,7 @@
     extra_config="${extra_config} --disable-multilib"
     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}"
     [ "${CT_SHARED_LIBS}" = "y" ]     || extra_config="${extra_config} --disable-shared"
-    [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
+    [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
     [ -n "${CT_CC_PKGVERSION}" ]      && extra_config="${extra_config} --with-pkgversion=${CT_CC_PKGVERSION}"
     [ -n "${CT_CC_BUGURL}" ]          && extra_config="${extra_config} --with-bugurl=${CT_CC_BUGURL}"
     if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then
diff -r 8c816e372384 -r 8e58024f8e37 scripts/build/debug/300-gdb.sh
--- a/scripts/build/debug/300-gdb.sh	Wed Jul 09 21:13:07 2008 +0000
+++ b/scripts/build/debug/300-gdb.sh	Sun Jul 13 10:32:38 2008 +0000
@@ -52,7 +52,7 @@
         cd "${CT_BUILD_DIR}/build-gdb-cross"
 
         cross_extra_config="${extra_config}"
-        if [ "${CT_CC_GCC_GMP_MPFR}" = "y" ]; then
+        if [ "${CT_GMP_MPFR}" = "y" ]; then
             cross_extra_config="${cross_extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}"
         fi
         case "${CT_THREADS}" in