1 files changed, 5 insertions, 2 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index d539070d5d..03138bf0ee 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -653,11 +653,14 @@ void Driver::BuildJobs(Compilation &C) const {
                        II);
   }
 
-  // If there were no errors, warn about any unused arguments.
+  // If there were errors, don't warn about any unused arguments.
+  if (Diags.getNumErrors())
+    return;
+
   for (ArgList::const_iterator it = C.getArgs().begin(), ie = C.getArgs().end();
        it != ie; ++it) {
     Arg *A = *it;
-
+      
     // FIXME: It would be nice to be able to send the argument to the
     // Diagnostic, so that extra values, position, and so on could be
     // printed.