1.1 --- a/config/companion_libs.in	Wed Feb 17 23:47:47 2010 +0100
     1.2 +++ b/config/companion_libs.in	Thu Feb 18 20:43:31 2010 +0100
     1.3 @@ -6,6 +6,10 @@
     1.4  
     1.5  comment "FIXME: check real dependencies!!!"
     1.6  
     1.7 +config COMPLIBS
     1.8 +    bool
     1.9 +    default n
    1.10 +
    1.11  config WRAPPER_NEEDED
    1.12      bool
    1.13      default n
    1.14 @@ -13,6 +17,7 @@
    1.15  config GMP
    1.16      bool
    1.17      prompt "GMP"
    1.18 +    select COMPLIBS
    1.19      select WRAPPER_NEEDED
    1.20      help
    1.21        gcc 4.3.0 and above requires GMP to build some frontends, and some
    1.22 @@ -31,6 +36,7 @@
    1.23      bool
    1.24      prompt "MPFR"
    1.25      select GMP
    1.26 +    select COMPLIBS
    1.27      select WRAPPER_NEEDED
    1.28      help
    1.29        gcc 4.3.0 and above requires MPFR to build some frontends, and some
    1.30 @@ -50,6 +56,7 @@
    1.31      prompt "PPL"
    1.32      select GMP
    1.33      select MPFR
    1.34 +    select COMPLIBS
    1.35      select WRAPPER_NEEDED
    1.36      help
    1.37        gcc-4.4.0 and above requires PPL to build some parts of the optimiser
    1.38 @@ -65,6 +72,7 @@
    1.39      select GMP
    1.40      select MPFR
    1.41      select PPL
    1.42 +    select COMPLIBS
    1.43      select WRAPPER_NEEDED
    1.44      help
    1.45        gcc-4.4.0 and above requires CLooG/PPL to build some parts of the
    1.46 @@ -81,6 +89,7 @@
    1.47      select MPFR
    1.48      select PPL
    1.49      select CLOOG
    1.50 +    select COMPLIBS
    1.51      select WRAPPER_NEEDED
    1.52      help
    1.53        gcc-4.4.0 and above can also optionally use MPC to enable additional
    1.54 @@ -111,12 +120,13 @@
    1.55      bool
    1.56  
    1.57  comment "Companion libraries common options"
    1.58 -    depends on GMP || MPFR || PPL || CLOOG || MPC
    1.59 +    depends on COMPLIBS || WRAPPER_NEEDED
    1.60 +
    1.61 +if COMPLIBS
    1.62  
    1.63  config COMP_LIBS_CHECK
    1.64      bool
    1.65      prompt "|  Check the companion libraries builds (!!! READ HELP!!!)"
    1.66 -    depends on GMP || MPFR || PPL || CLOOG || MPC
    1.67      default n
    1.68      help
    1.69        It is highly recommended to check the newly built companion libraries.
    1.70 @@ -132,10 +142,9 @@
    1.71        building PPL on my machine takes roughly 1'40", while checking it takes
    1.72        about 1h40'...
    1.73  
    1.74 -config COMP_LIBS_TARGET
    1.75 +config COMPLIBS_TARGET
    1.76      bool
    1.77      prompt "|  Build companion libraries for the target"
    1.78 -    depends on GMP || MPFR || PPL || CLOOG || MPC
    1.79      depends on ! BARE_METAL
    1.80      default n
    1.81      help
    1.82 @@ -145,6 +154,8 @@
    1.83        
    1.84        Please note that for now, crosstool-NG can only build GMP and MPFR so.
    1.85  
    1.86 +endif # COMPLIBS
    1.87 +
    1.88  choice
    1.89      bool
    1.90      prompt "|  Install tools wrapper as:"