1.1 --- a/config/binutils/binutils.in	Wed Feb 17 23:47:47 2010 +0100
     1.2 +++ b/config/binutils/binutils.in	Thu Feb 18 20:43:31 2010 +0100
     1.3 @@ -81,7 +81,7 @@
     1.4      default n
     1.5      select GMP
     1.6      select MPFR
     1.7 -    select COMP_LIBS_TARGET
     1.8 +    select COMPLIBS_TARGET
     1.9      help
    1.10        binutils can be configured to use GMP and MPFR.
    1.11        While this is automatically handled for the cross-binutils,

     2.1 --- a/config/companion_libs.in	Wed Feb 17 23:47:47 2010 +0100
     2.2 +++ b/config/companion_libs.in	Thu Feb 18 20:43:31 2010 +0100
     2.3 @@ -6,6 +6,10 @@
     2.4  
     2.5  comment "FIXME: check real dependencies!!!"
     2.6  
     2.7 +config COMPLIBS
     2.8 +    bool
     2.9 +    default n
    2.10 +
    2.11  config WRAPPER_NEEDED
    2.12      bool
    2.13      default n
    2.14 @@ -13,6 +17,7 @@
    2.15  config GMP
    2.16      bool
    2.17      prompt "GMP"
    2.18 +    select COMPLIBS
    2.19      select WRAPPER_NEEDED
    2.20      help
    2.21        gcc 4.3.0 and above requires GMP to build some frontends, and some
    2.22 @@ -31,6 +36,7 @@
    2.23      bool
    2.24      prompt "MPFR"
    2.25      select GMP
    2.26 +    select COMPLIBS
    2.27      select WRAPPER_NEEDED
    2.28      help
    2.29        gcc 4.3.0 and above requires MPFR to build some frontends, and some
    2.30 @@ -50,6 +56,7 @@
    2.31      prompt "PPL"
    2.32      select GMP
    2.33      select MPFR
    2.34 +    select COMPLIBS
    2.35      select WRAPPER_NEEDED
    2.36      help
    2.37        gcc-4.4.0 and above requires PPL to build some parts of the optimiser
    2.38 @@ -65,6 +72,7 @@
    2.39      select GMP
    2.40      select MPFR
    2.41      select PPL
    2.42 +    select COMPLIBS
    2.43      select WRAPPER_NEEDED
    2.44      help
    2.45        gcc-4.4.0 and above requires CLooG/PPL to build some parts of the
    2.46 @@ -81,6 +89,7 @@
    2.47      select MPFR
    2.48      select PPL
    2.49      select CLOOG
    2.50 +    select COMPLIBS
    2.51      select WRAPPER_NEEDED
    2.52      help
    2.53        gcc-4.4.0 and above can also optionally use MPC to enable additional
    2.54 @@ -111,12 +120,13 @@
    2.55      bool
    2.56  
    2.57  comment "Companion libraries common options"
    2.58 -    depends on GMP || MPFR || PPL || CLOOG || MPC
    2.59 +    depends on COMPLIBS || WRAPPER_NEEDED
    2.60 +
    2.61 +if COMPLIBS
    2.62  
    2.63  config COMP_LIBS_CHECK
    2.64      bool
    2.65      prompt "|  Check the companion libraries builds (!!! READ HELP!!!)"
    2.66 -    depends on GMP || MPFR || PPL || CLOOG || MPC
    2.67      default n
    2.68      help
    2.69        It is highly recommended to check the newly built companion libraries.
    2.70 @@ -132,10 +142,9 @@
    2.71        building PPL on my machine takes roughly 1'40", while checking it takes
    2.72        about 1h40'...
    2.73  
    2.74 -config COMP_LIBS_TARGET
    2.75 +config COMPLIBS_TARGET
    2.76      bool
    2.77      prompt "|  Build companion libraries for the target"
    2.78 -    depends on GMP || MPFR || PPL || CLOOG || MPC
    2.79      depends on ! BARE_METAL
    2.80      default n
    2.81      help
    2.82 @@ -145,6 +154,8 @@
    2.83        
    2.84        Please note that for now, crosstool-NG can only build GMP and MPFR so.
    2.85  
    2.86 +endif # COMPLIBS
    2.87 +
    2.88  choice
    2.89      bool
    2.90      prompt "|  Install tools wrapper as:"

     3.1 --- a/config/debug/gdb.in	Wed Feb 17 23:47:47 2010 +0100
     3.2 +++ b/config/debug/gdb.in	Thu Feb 18 20:43:31 2010 +0100
     3.3 @@ -60,7 +60,7 @@
     3.4      depends on GDB_NATIVE
     3.5      select GMP
     3.6      select MPFR
     3.7 -    select COMP_LIBS_TARGET
     3.8 +    select COMPLIBS_TARGET
     3.9      help
    3.10        gdb can make use of the GMP and MPFR libraries.
    3.11        

     4.1 --- a/scripts/build/binutils/binutils.sh	Wed Feb 17 23:47:47 2010 +0100
     4.2 +++ b/scripts/build/binutils/binutils.sh	Thu Feb 18 20:43:31 2010 +0100
     4.3 @@ -84,7 +84,7 @@
     4.4      done
     4.5  
     4.6      # If GMP and MPFR were configured, then use that
     4.7 -    if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
     4.8 +    if [ "${CT_BINUTILS_TARGET_USE_GMP_MPFR}" = "y" ]; then
     4.9          extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr")
    4.10          extra_config+=("--with-mpfr=${CT_SYSROOT_DIR}/usr")
    4.11      fi

     5.1 --- a/scripts/build/companion_libs/gmp.sh	Wed Feb 17 23:47:47 2010 +0100
     5.2 +++ b/scripts/build/companion_libs/gmp.sh	Thu Feb 18 20:43:31 2010 +0100
     5.3 @@ -56,7 +56,7 @@
     5.4      CT_EndStep
     5.5  }
     5.6  
     5.7 -if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
     5.8 +if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then
     5.9  
    5.10  do_gmp_target() {
    5.11      mkdir -p "${CT_BUILD_DIR}/build-gmp-target"
    5.12 @@ -87,6 +87,6 @@
    5.13      CT_EndStep
    5.14  }
    5.15  
    5.16 -fi # CT_COMP_LIBS_TARGET == y
    5.17 +fi # CT_COMPLIBS_TARGET == y
    5.18  
    5.19  fi # CT_GMP == y

     6.1 --- a/scripts/build/companion_libs/mpfr.sh	Wed Feb 17 23:47:47 2010 +0100
     6.2 +++ b/scripts/build/companion_libs/mpfr.sh	Thu Feb 18 20:43:31 2010 +0100
     6.3 @@ -106,7 +106,7 @@
     6.4      CT_EndStep
     6.5  }
     6.6  
     6.7 -if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then
     6.8 +if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then
     6.9  
    6.10  do_mpfr_target() {
    6.11      mkdir -p "${CT_BUILD_DIR}/build-mpfr-target"
    6.12 @@ -145,6 +145,6 @@
    6.13      CT_EndStep
    6.14  }
    6.15  
    6.16 -fi # CT_COMP_LIBS_TARGET == y
    6.17 +fi # CT_COMPLIBS_TARGET == y
    6.18  
    6.19  fi # CT_MPFR == y