diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index be51372..a9d67b3 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -538,8 +538,9 @@
     assert(VD->isFileVarDecl() && "Cannot emit local var decl as global.");
 
     // In C++, if this is marked "extern", defer code generation.
-    if (getLangOptions().CPlusPlus && 
-        VD->getStorageClass() == VarDecl::Extern && !VD->getInit())
+    if (getLangOptions().CPlusPlus && !VD->getInit() &&
+        (VD->getStorageClass() == VarDecl::Extern || 
+         VD->isExternC(getContext())))
       return;
 
     // In C, if this isn't a definition, defer code generation.