diff -r ef8549b58b6f -r 54fc137f9dc8 config/cc.in
--- a/config/cc.in	Sun Sep 14 16:21:07 2008 +0000
+++ b/config/cc.in	Mon Oct 13 16:58:52 2008 +0000
@@ -2,38 +2,13 @@
 
 menu "C compiler"
 
-choice
-    bool
-    prompt "C compiler flavour"
-    default CC_GCC
-
-config CC_GCC
-    bool
-    prompt "gcc"
-    select CC_SUPPORT_CXX
-    select CC_SUPPORT_FORTRAN
-    select CC_SUPPORT_JAVA
-    select CC_SUPPORT_ADA
-    select CC_SUPPORT_OBJC
-    select CC_SUPPORT_OBJCXX
-    help
-      gcc is the full-blown GNU compiler. This is what most people will choose.
-      
-      gcc supports many languages, a powerful code parser, optimised binary 
-      output, and lots of other features.
-
-endchoice
+config CC
+    string
 
 config CC_VERSION
     string
 
-config CC
-    string
-    default "gcc" if CC_GCC
-
-if CC_GCC
-source config/cc/gcc.in
-endif
+source config.gen/cc.in
 
 config CC_SUPPORT_CXX
     bool