diff -r 5d4e91c0343e -r c0bf2319af08 config/toolchain.in
--- a/config/toolchain.in	Sun Jul 17 16:53:40 2011 +0200
+++ b/config/toolchain.in	Tue Dec 13 23:32:39 2011 +0100
@@ -46,20 +46,14 @@
       In fact, the sysroot path is constructed as:
         ${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME}
 
-# In case we need to add more conditions to enable static
-# toolchain, we'll be adding them here
-config STATIC_TOOLCHAIN_POSSIBLE
+config WANTS_STATIC_LINK
     bool
-    default y
-    depends on CONFIGURE_static_link_ok
-    depends on CONFIGURE_has_static_libstdcxx
-    # Add new deps here! :-)
 
 config STATIC_TOOLCHAIN
     bool
     prompt "Build Static Toolchain (EXPERIMENTAL)"
     depends on EXPERIMENTAL
-    depends on STATIC_TOOLCHAIN_POSSIBLE
+    select WANTS_STATIC_LINK
     help
       Build static host binaries.
       
@@ -68,8 +62,9 @@
       you can say 'Y' here, and all the host tools will be linked statically.
       
       The impacted tools are:
-        - the GNU binutils
-        - the cross-gdb
+        - the cross-binutils (GNU binutils, elf2flt)
+        - the cross-compiler (gcc)
+        - the cross-debugger (gdb)
       
       The default is 'N', to build dynamicaly-linked host binaries.