diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2012-11-15 05:36:36 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2012-11-15 05:36:36 +0000 |
| commit | 5cc9ebb7232383476d0dded69104838e6a15eb70 (patch) | |
| tree | 3f10053437994cc009e01abcbfbc37f02ad0f0d3 /clang/lib/Driver/WindowsToolChain.cpp | |
| parent | 03c3a2f5bbf91157862a08c5a30fe9fb8e20465a (diff) | |
| download | bcm5719-llvm-5cc9ebb7232383476d0dded69104838e6a15eb70.tar.gz bcm5719-llvm-5cc9ebb7232383476d0dded69104838e6a15eb70.zip | |
Revert r167567, restoring the ability of clang to run gcc in cases where it
can't handle the input file type. This resulted in PR14338.
llvm-svn: 168024
Diffstat (limited to 'clang/lib/Driver/WindowsToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/WindowsToolChain.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/clang/lib/Driver/WindowsToolChain.cpp b/clang/lib/Driver/WindowsToolChain.cpp index a93702e6934..ac6518712f0 100644 --- a/clang/lib/Driver/WindowsToolChain.cpp +++ b/clang/lib/Driver/WindowsToolChain.cpp @@ -37,7 +37,12 @@ Windows::Windows(const Driver &D, const llvm::Triple& Triple) Tool &Windows::SelectTool(const Compilation &C, const JobAction &JA, const ActionList &Inputs) const { - Action::ActionClass Key = JA.getKind(); + Action::ActionClass Key; + if (getDriver().ShouldUseClangCompiler(C, JA, getTriple())) + Key = Action::AnalyzeJobClass; + else + Key = JA.getKind(); + bool UseIntegratedAs = C.getArgs().hasFlag(options::OPT_integrated_as, options::OPT_no_integrated_as, IsIntegratedAssemblerDefault()); |
