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 | 5bab9ae87c41148ee2f92d312945c1e9303222e8 (patch) | |
| tree | 256d66a02ba4783bdf0aa56a9858a19d92decd7e /lib/Driver/WindowsToolChain.cpp | |
| parent | 5d1cf4f292cb060b1973eb197607fc6d5716bd12 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@168024 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/WindowsToolChain.cpp')
| -rw-r--r-- | lib/Driver/WindowsToolChain.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/Driver/WindowsToolChain.cpp b/lib/Driver/WindowsToolChain.cpp index a93702e693..ac6518712f 100644 --- a/lib/Driver/WindowsToolChain.cpp +++ b/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()); |