summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver
diff options
context:
space:
mode:
authorTed Kremenek <kremenek@apple.com>2012-07-07 05:53:30 +0000
committerTed Kremenek <kremenek@apple.com>2012-07-07 05:53:30 +0000
commitb22ea2acea481d3b171d6d55993f519ae97322db (patch)
tree40b9c19a2a278c31c787e23a8c8c1f60964298e5 /clang/lib/Driver
parent87255e340e332c847103e6f2cfb324eaa24039ea (diff)
downloadbcm5719-llvm-b22ea2acea481d3b171d6d55993f519ae97322db.tar.gz
bcm5719-llvm-b22ea2acea481d3b171d6d55993f519ae97322db.zip
Re-apply r159875 with fixes.
- Split pedantic driver flag test into separate test file, and XFAIL on cygwin,mingw32 - Fix bug in tablegen logic where a missing '{' caused errors to be included in -Wpedantic. llvm-svn: 159892
Diffstat (limited to 'clang/lib/Driver')
-rw-r--r--clang/lib/Driver/Tools.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index dd198a1e9d8..66d792ffba3 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -2093,7 +2093,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
}
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);
OpenPOWER on IntegriCloud