diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-03-24 15:06:53 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-03-24 15:06:53 +0000 |
| commit | 29511875348c49c9c5a14bb086cd51e17feb01c9 (patch) | |
| tree | 8891d79d3a7906ff8acbcf6c0ce7f80fba9b0362 /lib/Driver/ToolChain.cpp | |
| parent | 1db7040604154f71c54cf1329ae384fbef196668 (diff) | |
Reject -no-integrated-as on windows.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177840 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/ToolChain.cpp')
| -rw-r--r-- | lib/Driver/ToolChain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp index b24de5d132..19270b2aa3 100644 --- a/lib/Driver/ToolChain.cpp +++ b/lib/Driver/ToolChain.cpp @@ -117,13 +117,13 @@ Tool *ToolChain::getTool(Action::ActionClass AC) const { llvm_unreachable("Invalid tool kind."); } -Tool &ToolChain::SelectTool(const JobAction &JA) const { +Tool *ToolChain::SelectTool(const JobAction &JA) const { if (getDriver().ShouldUseClangCompiler(JA)) - return *getClang(); + return getClang(); Action::ActionClass AC = JA.getKind(); if (AC == Action::AssembleJobClass && useIntegratedAs()) - return *getClangAs(); - return *getTool(AC); + return getClangAs(); + return getTool(AC); } std::string ToolChain::GetFilePath(const char *Name) const { |