summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Driver.cpp
diff options
context:
space:
mode:
authorGreg Bedwell <greg_bedwell@sn.scee.net>2015-06-09 10:24:06 +0000
committerGreg Bedwell <greg_bedwell@sn.scee.net>2015-06-09 10:24:06 +0000
commit065f70ae80c4501336608d38465fc53cc46a35c0 (patch)
treee8e441146599b725fb4b4020ac50ca9801737c99 /clang/lib/Driver/Driver.cpp
parent0389d66b0cd5f1b2669e451f6513b0b34c94a9fa (diff)
downloadbcm5719-llvm-065f70ae80c4501336608d38465fc53cc46a35c0.tar.gz
bcm5719-llvm-065f70ae80c4501336608d38465fc53cc46a35c0.zip
clang-cl: Ignore the /o option when /P is specified.
This matches the cl.exe behavior (tested with 18.00.31101). In order to specify an output file for /P, use the /Fi option instead. Differential Revision: http://reviews.llvm.org/D10313 llvm-svn: 239393
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
-rw-r--r--clang/lib/Driver/Driver.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 349c53dd757..8cca1de0fb2 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -1692,8 +1692,7 @@ const char *Driver::GetNamedOutputPath(Compilation &C,
assert(AtTopLevel && isa<PreprocessJobAction>(JA));
StringRef BaseName = llvm::sys::path::filename(BaseInput);
StringRef NameArg;
- if (Arg *A = C.getArgs().getLastArg(options::OPT__SLASH_Fi,
- options::OPT__SLASH_o))
+ if (Arg *A = C.getArgs().getLastArg(options::OPT__SLASH_Fi))
NameArg = A->getValue();
return C.addResultFile(MakeCLOutputFilename(C.getArgs(), NameArg, BaseName,
types::TY_PP_C), &JA);
OpenPOWER on IntegriCloud