tools wrapper: move choice selection to a more appropriate place

Move the tools wrapper choice selection down to the companion libraries
sub-menu, to avoid the user going back and forth in the menu.

config/companion_libs.in

@@ -91,4 +91,35 @@ config COMP_LIBS_TARGET
       
       Please note that for now, crosstool-NG can only build GMP and MPFR so.
 
+choice
+    bool
+    prompt "|  Install tools wrapper as:"
+    depends on WRAPPER_NEEDED
+    default TOOLS_WRAPPER_SHELL
+
+config TOOLS_WRAPPER_SCRIPT
+    bool
+    prompt "shell script"
+    help
+      If your host has a shell, then you should say 'Y' here, to use
+      a (very very simple) shell script as wrapper.
+      
+      See docs/overview.txt, section "Tools wrapper".
+
+config TOOLS_WRAPPER_EXEC
+    bool
+    prompt "executable"
+    help
+      If your host lacks a shell, then you should say 'Y' here, to use
+      an executable.
+      
+      See docs/overview.txt, section "Tools wrapper".
+
+endchoice
+
+config TOOLS_WRAPPER
+    string
+    default "script" if TOOLS_WRAPPER_SCRIPT
+    default "exec"   if TOOLS_WRAPPER_EXEC
+
 endmenu

config/toolchain.in

@@ -285,38 +285,4 @@ config TARGET_SUFFIX
 
 endif # CROSS_NATIVE || CANADIAN
 
-# Necessary for all types of toolchains, at least for gcc > 4.3.x
-comment "Host specifics"
-
-choice
-    bool
-    prompt "|  Install tools wrapper as:"
-    depends on WRAPPER_NEEDED
-    default TOOLS_WRAPPER_SHELL
-
-config TOOLS_WRAPPER_SCRIPT
-    bool
-    prompt "shell script"
-    help
-      If your host has a shell, then you should say 'Y' here, to use
-      a (very very simple) shell script as wrapper.
-      
-      See docs/overview.txt, section "Tools wrapper".
-
-config TOOLS_WRAPPER_EXEC
-    bool
-    prompt "executable"
-    help
-      If your host lacks a shell, then you should say 'Y' here, to use
-      an executable.
-      
-      See docs/overview.txt, section "Tools wrapper".
-
-endchoice
-
-config TOOLS_WRAPPER
-    string
-    default "script" if TOOLS_WRAPPER_SCRIPT
-    default "exec"   if TOOLS_WRAPPER_EXEC
-
 endmenu