commit 7dd1783c5e56d171aaaeca9201a6b2e14b40cd2d
author John McCall <rjmccall@apple.com> Wed Jun 13 19:48:01 2012 +0000
committer John McCall <rjmccall@apple.com> Wed Jun 13 19:48:01 2012 +0000
tree e7038efbf0da4bdf076914b65ee6a8a77ec72499
parent b4603f4dc3a334108c58b6c35f4e44a5dbf5aac6

Provide a -no-pedantic to cancel out -pedantic.

llvm-svn: 158416

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index e84c72f..dec9dba 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -2034,7 +2034,8 @@
   }
 
   Args.AddAllArgs(CmdArgs, options::OPT_W_Group);
-  Args.AddLastArg(CmdArgs, options::OPT_pedantic);
+  if (Args.hasFlag(options::OPT_pedantic, options::OPT_no_pedantic, false))
+    CmdArgs.push_back("-pedantic");
   Args.AddLastArg(CmdArgs, options::OPT_pedantic_errors);
   Args.AddLastArg(CmdArgs, options::OPT_w);