1.1 --- a/config/companion_libs.in	Wed Dec 22 00:34:56 2010 +0100
     1.2 +++ b/config/companion_libs.in	Wed Apr 06 22:30:57 2011 +0200
     1.3 @@ -48,10 +48,6 @@
     1.4      bool
     1.5      default n
     1.6  
     1.7 -config WRAPPER_NEEDED
     1.8 -    bool
     1.9 -    default n
    1.10 -
    1.11  config GMP
    1.12      bool
    1.13      select COMPLIBS
    1.14 @@ -113,11 +109,6 @@
    1.15  
    1.16  comment "Companion libraries common options"
    1.17  
    1.18 -config COMPLIBS_BACKUP
    1.19 -    bool
    1.20 -    default y
    1.21 -    depends on ! COMPLIBS_SHARED
    1.22 -
    1.23  config COMPLIBS_CHECK
    1.24      bool
    1.25      prompt "Check the companion libraries builds (!!! READ HELP!!!)"
    1.26 @@ -136,52 +127,6 @@
    1.27        building PPL on my machine takes roughly 1'40", while checking it takes
    1.28        about 1h40'...
    1.29  
    1.30 -config COMPLIBS_SHARED
    1.31 -    bool
    1.32 -    prompt "Build shared companion libraries"
    1.33 -    default n
    1.34 -    depends on COMPLIBS
    1.35 -    depends on ! STATIC_TOOLCHAIN
    1.36 -    select WRAPPER_NEEDED
    1.37 -    help
    1.38 -      By default, the companion libraries will be build static. If you want to
    1.39 -      build shared libraries, then you can say 'Y' here, but a wrapper will be
    1.40 -      needed (see: "docs/4 - Building the toolchain.txt", in the section
    1.41 -      "Tools wrapper").
    1.42 -      
    1.43 -      It is highly recommended that you keep static libraries.
    1.44 -
    1.45 -choice
    1.46 -    bool
    1.47 -    prompt "|  Install tools wrapper as:"
    1.48 -    depends on WRAPPER_NEEDED
    1.49 -    default TOOLS_WRAPPER_SHELL
    1.50 -
    1.51 -config TOOLS_WRAPPER_SCRIPT
    1.52 -    bool
    1.53 -    prompt "shell script"
    1.54 -    help
    1.55 -      If your host has a shell, then you should say 'Y' here, to use
    1.56 -      a (very very simple) shell script as wrapper.
    1.57 -      
    1.58 -      See: "docs/4 - Building the toolchain.txt", in the section "Tools wrapper".
    1.59 -
    1.60 -config TOOLS_WRAPPER_EXEC
    1.61 -    bool
    1.62 -    prompt "executable"
    1.63 -    help
    1.64 -      If your host lacks a shell, then you should say 'Y' here, to use
    1.65 -      an executable.
    1.66 -      
    1.67 -      See: "docs/4 - Building the toolchain.txt", in the section "Tools wrapper".
    1.68 -
    1.69 -endchoice
    1.70 -
    1.71 -config TOOLS_WRAPPER
    1.72 -    string
    1.73 -    default "script" if TOOLS_WRAPPER_SCRIPT
    1.74 -    default "exec"   if TOOLS_WRAPPER_EXEC
    1.75 -
    1.76  endif # COMPLIBS
    1.77  
    1.78  endmenu