diff -r e5fb003a354c -r 13df2720b374 config/cc/gcc.in.2
--- a/config/cc/gcc.in.2	Mon Jun 27 21:03:40 2011 +0200
+++ b/config/cc/gcc.in.2	Fri Oct 14 22:44:24 2011 +0200
@@ -44,9 +44,8 @@
     bool
     prompt "Link libstdc++ statically into the gcc binary"
     default y
-    depends on CONFIGURE_static_link_ok
-    depends on CONFIGURE_has_static_libstdcxx
     depends on CC_GCC_4_4_or_later
+    select WANTS_STATIC_LINK
     help
       Newer gcc versions use the PPL library which is C++ code.  Statically
       linking libstdc++ increases the likeliness that the gcc binary will