# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1252230460 -7200
# Node ID 545179329bc5ad6c22c40712cf6b011b53c0ea5d
# Parent  461d964d7df26f7c1855a2a6f9b12dd4b6e40725
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.

diff -r 461d964d7df2 -r 545179329bc5 config/companion_libs.in
--- a/config/companion_libs.in	Sun Sep 06 11:13:28 2009 +0200
+++ b/config/companion_libs.in	Sun Sep 06 11:47:40 2009 +0200
@@ -91,4 +91,35 @@
       
       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
diff -r 461d964d7df2 -r 545179329bc5 config/toolchain.in
--- a/config/toolchain.in	Sun Sep 06 11:13:28 2009 +0200
+++ b/config/toolchain.in	Sun Sep 06 11:47:40 2009 +0200
@@ -285,38 +285,4 @@
 
 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