1.1 --- a/config/companion_libs.in Sat Apr 10 23:42:28 2010 +0200
1.2 +++ b/config/companion_libs.in Tue Apr 13 20:52:38 2010 +0200
1.3 @@ -17,7 +17,6 @@
1.4 config GMP
1.5 bool
1.6 select COMPLIBS
1.7 - select WRAPPER_NEEDED
1.8 help
1.9 gcc 4.3.0 and above requires GMP to build some frontends, and some
1.10 other components can use them as well.
1.11 @@ -35,7 +34,6 @@
1.12 bool
1.13 select GMP
1.14 select COMPLIBS
1.15 - select WRAPPER_NEEDED
1.16 help
1.17 gcc 4.3.0 and above requires MPFR to build some frontends, and some
1.18 other components can use them as well.
1.19 @@ -54,7 +52,6 @@
1.20 select GMP
1.21 select MPFR
1.22 select COMPLIBS
1.23 - select WRAPPER_NEEDED
1.24 help
1.25 gcc-4.4.0 and above requires PPL to build some parts of the optimiser
1.26 (the GRAPHITE loop optimisation, to be precise).
1.27 @@ -69,7 +66,6 @@
1.28 select MPFR
1.29 select PPL
1.30 select COMPLIBS
1.31 - select WRAPPER_NEEDED
1.32 help
1.33 gcc-4.4.0 and above requires CLooG/PPL to build some parts of the
1.34 optimiser (the GRAPHITE loop optimisation, to be precise).
1.35 @@ -85,7 +81,6 @@
1.36 select PPL
1.37 select CLOOG
1.38 select COMPLIBS
1.39 - select WRAPPER_NEEDED
1.40 help
1.41 gcc-4.4.0 and above can also optionally use MPC to enable additional
1.42 optimisations on complex numbers. Although MPC is optional,
1.43 @@ -98,7 +93,6 @@
1.44 config LIBELF
1.45 bool
1.46 select COMPLIBS
1.47 - select WRAPPER_NEEDED
1.48 help
1.49 gcc-4.5.0 and above can also use libelf to enable some optimisation
1.50 (LTO, Link-Time Optimisation, to be precise). Although libelf is
1.51 @@ -170,14 +164,14 @@
1.52 config FOO
1.53 bool
1.54
1.55 +if COMPLIBS
1.56 +
1.57 comment "Companion libraries common options"
1.58 - depends on COMPLIBS || WRAPPER_NEEDED
1.59
1.60 config COMPLIBS_CHECK
1.61 bool
1.62 - prompt "| Check the companion libraries builds (!!! READ HELP!!!)"
1.63 + prompt "Check the companion libraries builds (!!! READ HELP!!!)"
1.64 default n
1.65 - depends on COMPLIBS
1.66 help
1.67 It is highly recommended to check the newly built companion libraries.
1.68 Unfortunately, this is a very intensive task, and takes a loooong time.
1.69 @@ -192,6 +186,19 @@
1.70 building PPL on my machine takes roughly 1'40", while checking it takes
1.71 about 1h40'...
1.72
1.73 +config COMPLIBS_SHARED
1.74 + bool
1.75 + prompt "Build shared companion libraries"
1.76 + default n
1.77 + depends on COMPLIBS
1.78 + select WRAPPER_NEEDED
1.79 + help
1.80 + By default, the companion libraries will be build static. If you want to
1.81 + build shared libraries, then you can say 'Y' here, but a wrapper will be
1.82 + needed (see docs/overview.txt,section "Tools wrapper").
1.83 +
1.84 + It is highly recommended that you keep static libraries.
1.85 +
1.86 choice
1.87 bool
1.88 prompt "| Install tools wrapper as:"
1.89 @@ -223,4 +230,6 @@
1.90 default "script" if TOOLS_WRAPPER_SCRIPT
1.91 default "exec" if TOOLS_WRAPPER_EXEC
1.92
1.93 +endif # COMPLIBS
1.94 +
1.95 endmenu