1.1 --- a/config/companion_libs.in	Thu Feb 18 20:43:31 2010 +0100
     1.2 +++ b/config/companion_libs.in	Wed Feb 17 23:50:49 2010 +0100
     1.3 @@ -100,19 +100,54 @@
     1.4        can say 'Y' here, although it is unknown yet if any other component
     1.5        can use it.
     1.6  
     1.7 -if GMP
     1.8 +config GMP_TARGET
     1.9 +    bool
    1.10 +
    1.11 +config MPFR_TARGET
    1.12 +    bool
    1.13 +    select GMP_TARGET
    1.14 +
    1.15 +config PPL_TARGET
    1.16 +    bool
    1.17 +    select GMP_TARGET
    1.18 +    select MPFR_TARGET
    1.19 +
    1.20 +config CLOOG_TARGET
    1.21 +    bool
    1.22 +    select GMP_TARGET
    1.23 +    select MPFR_TARGET
    1.24 +    select PPL_TARGET
    1.25 +
    1.26 +config MPC_TARGET
    1.27 +    bool
    1.28 +    select GMP_TARGET
    1.29 +    select MPFR_TARGET
    1.30 +    select PPL_TARGET
    1.31 +    select CLOOG_TARGET
    1.32 +
    1.33 +if GMP || GMP_TARGET
    1.34 +comment "GMP version needed to build for target"
    1.35 +    depends on !GMP
    1.36  source config/companion_libs/gmp.in
    1.37  endif
    1.38 -if MPFR
    1.39 +if MPFR || MPFR_TARGET
    1.40 +comment "MPFR version needed to build for target"
    1.41 +    depends on !MPFR
    1.42  source config/companion_libs/mpfr.in
    1.43  endif
    1.44 -if PPL
    1.45 +if PPL || PPL_TARGET
    1.46 +comment "PPL version needed to build for target"
    1.47 +    depends on !PPL
    1.48  source config/companion_libs/ppl.in
    1.49  endif
    1.50 -if CLOOG
    1.51 +if CLOOG || CLOOG_TARGET
    1.52 +comment "CLOOG version needed to build for target"
    1.53 +    depends on !CLOOG
    1.54  source config/companion_libs/cloog.in
    1.55  endif
    1.56 -if MPC
    1.57 +if MPC || MPC_TARGET
    1.58 +comment "MPC version needed to build for target"
    1.59 +    depends on !MPC
    1.60  source config/companion_libs/mpc.in
    1.61  endif
    1.62  
    1.63 @@ -122,12 +157,11 @@
    1.64  comment "Companion libraries common options"
    1.65      depends on COMPLIBS || WRAPPER_NEEDED
    1.66  
    1.67 -if COMPLIBS
    1.68 -
    1.69  config COMP_LIBS_CHECK
    1.70      bool
    1.71      prompt "|  Check the companion libraries builds (!!! READ HELP!!!)"
    1.72      default n
    1.73 +    depends on COMPLIBS
    1.74      help
    1.75        It is highly recommended to check the newly built companion libraries.
    1.76        Unfortunately, this is a very intensive task, and takes a loooong time.
    1.77 @@ -142,20 +176,6 @@
    1.78        building PPL on my machine takes roughly 1'40", while checking it takes
    1.79        about 1h40'...
    1.80  
    1.81 -config COMPLIBS_TARGET
    1.82 -    bool
    1.83 -    prompt "|  Build companion libraries for the target"
    1.84 -    depends on ! BARE_METAL
    1.85 -    default n
    1.86 -    help
    1.87 -      Also build companion libraries for the target. This can be usefull if
    1.88 -      you want to later build a compiler that will run on the target, or if
    1.89 -      you want to run gdb natively on the target.
    1.90 -      
    1.91 -      Please note that for now, crosstool-NG can only build GMP and MPFR so.
    1.92 -
    1.93 -endif # COMPLIBS
    1.94 -
    1.95  choice
    1.96      bool
    1.97      prompt "|  Install tools wrapper as:"