summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-08-02 18:06:44 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-08-02 18:06:44 (GMT)
commit27cdd4367c3099552fa5d3767cc066d516c70d9b (patch)
tree983adca713861f13eb84d927c0b9f83694daec03
parentd6195c648305674e568b4e0e4d29692f74335cbc (diff)
[config] Allow user to specify custom CONFIG_SHELL
In case the shell the user wants to use as CONFIG_SHELL is located in a weird place (eg. /opt/bash/bin/bash), or is weirdly named (eg. bash-4), let the user enter the patch to the shell.
-rw-r--r--config/global/build-behave.in21
-rw-r--r--scripts/crosstool-NG.sh.in1
2 files changed, 19 insertions, 3 deletions
diff --git a/config/global/build-behave.in b/config/global/build-behave.in
index afd54e2..ca43a09 100644
--- a/config/global/build-behave.in
+++ b/config/global/build-behave.in
@@ -89,10 +89,25 @@ config CONFIG_SHELL_BASH
See help for CONFIG_SHELL_SH, above, for more explanations.
+config CONFIG_SHELL_CUSTOM
+ bool
+ prompt "custom shell"
+ help
+ Enter full path to the custom shell below.
+
+ See help for CONFIG_SHELL_SH, above, for more explanations.
+
+config CONFIG_SHELL_CUSTOM_PATH
+ string
+ prompt "Path to custom shell"
+ depends on CONFIG_SHELL_CUSTOM
+ default "/bin/sh"
+
endchoice
config CONFIG_SHELL
string
- default "sh" if CONFIG_SHELL_SH
- default "ash" if CONFIG_SHELL_ASH
- default "bash" if CONFIG_SHELL_BASH
+ default "sh" if CONFIG_SHELL_SH
+ default "ash" if CONFIG_SHELL_ASH
+ default "bash" if CONFIG_SHELL_BASH
+ default "custom" if CONFIG_SHELL_CUSTOM
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 988ff79..ad03d2d 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -67,6 +67,7 @@ case "${CT_CONFIG_SHELL}" in
sh) CT_SHELL="/bin/sh";;
ash) CT_SHELL="/bin/ash";;
bash) CT_SHELL="${BASH}";;
+ custom) CT_SHELL="${CT_CONFIG_SHELL_CUSTOM_PATH}";;
esac
# Check the user is using an existing SHELL to be used by ./configure and Makefiles