summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-09-06 09:47:40 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-09-06 09:47:40 (GMT)
commitb7d11da128bf9d1ec2a7623d928bb5011d72c2a1 (patch)
tree244993e8e51ee61121e61d616d414dfcd6f5a461
parent2231853b856c1deaf032e915d415a640126befa3 (diff)
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.
-rw-r--r--config/companion_libs.in31
-rw-r--r--config/toolchain.in34
2 files changed, 31 insertions, 34 deletions
diff --git a/config/companion_libs.in b/config/companion_libs.in
index aa4b63a..7437d1f 100644
--- a/config/companion_libs.in
+++ b/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
diff --git a/config/toolchain.in b/config/toolchain.in
index 4b2c368..4039d9d 100644
--- a/config/toolchain.in
+++ b/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