diff -r 472cfde636a1 -r 461d964d7df2 config/toolchain.in
--- a/config/toolchain.in	Sun Aug 30 16:54:30 2009 +0200
+++ b/config/toolchain.in	Sun Sep 06 11:13:28 2009 +0200
@@ -285,10 +285,7 @@
 
 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
-
+# Necessary for all types of toolchains, at least for gcc > 4.3.x
 comment "Host specifics"
 
 choice
@@ -322,6 +319,4 @@
     default "script" if TOOLS_WRAPPER_SCRIPT
     default "exec"   if TOOLS_WRAPPER_EXEC
 
-endif # CROSS_NATIVE || CANADIAN
-
 endmenu