diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index afc57f127d3c..3d5c70d7c9c3 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -1990,9 +1990,10 @@ int main(int argc, char **argv) {
     fprintf(stderr, "clang version 1.0 based upon " PACKAGE_STRING
             " hosted on " LLVM_HOSTTRIPLE "\n");
 
-  if (unsigned NumDiagnostics = Diags.getNumDiagnostics())
-    fprintf(stderr, "%d diagnostic%s generated.\n", NumDiagnostics,
-            (NumDiagnostics == 1 ? "" : "s"));
+  if (!NoCaretDiagnostics)
+    if (unsigned NumDiagnostics = Diags.getNumDiagnostics())
+      fprintf(stderr, "%d diagnostic%s generated.\n", NumDiagnostics,
+              (NumDiagnostics == 1 ? "" : "s"));
   
   if (Stats) {
     FileMgr.PrintStats();