diff -r bd172b161ff8 -r 8ff20760e93b config/cc.in
--- a/config/cc.in	Thu Nov 22 23:56:58 2012 +0100
+++ b/config/cc.in	Fri Nov 08 15:18:09 2013 +0100
@@ -31,6 +31,9 @@
 config CC_SUPPORT_OBJCXX
     bool
 
+config CC_SUPPORT_GOLANG
+    bool
+
 comment "Additional supported languages:"
 
 config CC_LANG_CXX
@@ -98,6 +101,17 @@
       Only select this if you know that your specific version of the
       compiler supports this language.
 
+config CC_LANG_GOLANG
+    bool
+    prompt "Go (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    depends on CC_SUPPORT_GOLANG
+    help
+      Enable building a Go compiler.
+
+      Only select this if you know that your specific version of the
+      compiler supports this language.
+
 config CC_LANG_OTHERS
     string
     prompt "Other languages (EXPERIMENTAL)"