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 | 7976446c2cd2d21f9d863c6f23796bb277b293ce (patch) | |
| tree | 2b09d0d1a15967bf29fb62c6d38f17e09d47af34 /clang/lib/Driver/ToolChain.cpp | |
| parent | fb36ede52ebbd7a3c45c86968f15bccfe29d3645 (diff) | |
| download | bcm5719-llvm-7976446c2cd2d21f9d863c6f23796bb277b293ce.tar.gz bcm5719-llvm-7976446c2cd2d21f9d863c6f23796bb277b293ce.zip | |
Reject -no-integrated-as on windows.
llvm-svn: 177840
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index b24de5d132a..19270b2aa33 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/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 { |
