diff -r 4131f2e955aa -r 0dce3a3986a1 config/toolchain.in
--- a/config/toolchain.in	Fri Jun 26 19:09:22 2009 +0200
+++ b/config/toolchain.in	Sun Aug 30 00:27:12 2009 +0200
@@ -296,4 +296,42 @@
 
 endif # CROSS_NATIVE || CANADIAN
 
+# Kept as a separate if block, even if it could go into the above block,
+# because it seems better. No real reason, only that it seems right...
+if CANADIAN
+
+comment "Host specifics"
+
+choice
+    bool
+    prompt "|  Install tools wrapper as:"
+    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
+
+endif # CROSS_NATIVE || CANADIAN
+
 endmenu