summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2012-09-26 19:01:49 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2012-09-26 19:01:49 +0000
commit2715fce5244c2058aa02d45bda262904e7efa1ad (patch)
tree418c159d2baa3e203d515dbedea64a4002c0a912 /clang/lib/Driver/Tools.cpp
parent9802f9fb2a64df1c27251a3284394c2748122128 (diff)
downloadbcm5719-llvm-2715fce5244c2058aa02d45bda262904e7efa1ad.tar.gz
bcm5719-llvm-2715fce5244c2058aa02d45bda262904e7efa1ad.zip
Allow -MF to be used in combination with -E -M or -E -MM.
Fixes PR13851. Patch by Dimitry Andric! llvm-svn: 164717
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index f77d8ee6f36..12564b43f6c 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -219,11 +219,11 @@ void Clang::AddPreprocessingOptions(Compilation &C,
(A = Args.getLastArg(options::OPT_MMD))) {
// Determine the output location.
const char *DepFile;
- if (Output.getType() == types::TY_Dependencies) {
- DepFile = Output.getFilename();
- } else if (Arg *MF = Args.getLastArg(options::OPT_MF)) {
+ if (Arg *MF = Args.getLastArg(options::OPT_MF)) {
DepFile = MF->getValue(Args);
C.addFailureResultFile(DepFile);
+ } else if (Output.getType() == types::TY_Dependencies) {
+ DepFile = Output.getFilename();
} else if (A->getOption().matches(options::OPT_M) ||
A->getOption().matches(options::OPT_MM)) {
DepFile = "-";
OpenPOWER on IntegriCloud