1.1 --- a/config/companion_libs.in	Sun Aug 30 00:35:58 2009 +0200
     1.2 +++ b/config/companion_libs.in	Sun Aug 30 00:57:40 2009 +0200
     1.3 @@ -4,9 +4,14 @@
     1.4  
     1.5  menu "Companion libraries"
     1.6  
     1.7 +config WRAPPER_NEEDED
     1.8 +    bool
     1.9 +    default n
    1.10 +
    1.11  config GMP_MPFR
    1.12      bool
    1.13      prompt "GMP and MPFR"
    1.14 +    select WRAPPER_NEEDED
    1.15      help
    1.16        gcc 4.3.0 and above requires both GMP and MPFR to build some frontends,
    1.17        and some other components can use them as well.
    1.18 @@ -28,6 +33,7 @@
    1.19  config PPL_CLOOG_MPC
    1.20      bool
    1.21      prompt "PPL, GLooG/PPL and MPC"
    1.22 +    select WRAPPER_NEEDED
    1.23      help
    1.24        gcc-4.4.0 and above requires PPL and CLooG/PPL to build some parts
    1.25        of the optimiser (GRAPHITE loop optimisation, to be precise).

     2.1 --- a/config/toolchain.in	Sun Aug 30 00:35:58 2009 +0200
     2.2 +++ b/config/toolchain.in	Sun Aug 30 00:57:40 2009 +0200
     2.3 @@ -305,6 +305,7 @@
     2.4  choice
     2.5      bool
     2.6      prompt "|  Install tools wrapper as:"
     2.7 +    depends on WRAPPER_NEEDED
     2.8      default TOOLS_WRAPPER_SHELL
     2.9  
    2.10  config TOOLS_WRAPPER_SCRIPT

     3.1 --- a/scripts/build/internals.sh	Sun Aug 30 00:35:58 2009 +0200
     3.2 +++ b/scripts/build/internals.sh	Sun Aug 30 00:57:40 2009 +0200
     3.3 @@ -41,8 +41,7 @@
     3.4  
     3.5      # If using the companion libraries, we need a wrapper
     3.6      # that will set LD_LIBRARY_PATH approriately
     3.7 -    if [    "${CT_GMP_MPFR}" = "y"      \
     3.8 -         -o "${CT_PPL_CLOOG_MPC}" = "y" ]; then
     3.9 +    if [ "${CT_WRAPPER_NEEDED}" = "y" ]; then
    3.10          CT_DoLog EXTRA "Installing toolchain wrappers"
    3.11          CT_Pushd "${CT_PREFIX_DIR}/bin"
    3.12