diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-03-18 18:10:27 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-03-18 18:10:27 +0000 |
| commit | af370e6e051e505016637e23418354db625dc796 (patch) | |
| tree | feaf741f05a988c7b21d6de66b7d587084737a29 /lib/Driver/WindowsToolChain.cpp | |
| parent | 7ce8d82c4182b8b98d4b5c44f5258b9e9b2c1350 (diff) | |
Pass an ArgList to every toolchain constructor. Remove the useIntegratedAs
argument.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177301 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/WindowsToolChain.cpp')
| -rw-r--r-- | lib/Driver/WindowsToolChain.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Driver/WindowsToolChain.cpp b/lib/Driver/WindowsToolChain.cpp index a0a71a7d42..df4d72e091 100644 --- a/lib/Driver/WindowsToolChain.cpp +++ b/lib/Driver/WindowsToolChain.cpp @@ -31,8 +31,9 @@ using namespace clang::driver; using namespace clang::driver::toolchains; using namespace clang; -Windows::Windows(const Driver &D, const llvm::Triple& Triple) - : ToolChain(D, Triple) { +Windows::Windows(const Driver &D, const llvm::Triple& Triple, + const ArgList &Args) + : ToolChain(D, Triple, Args) { } Tool &Windows::SelectTool(const Compilation &C, const JobAction &JA) const { @@ -57,7 +58,7 @@ Tool &Windows::SelectTool(const Compilation &C, const JobAction &JA) const { case Action::CompileJobClass: T = new tools::Clang(*this); break; case Action::AssembleJobClass: - if (!useIntegratedAs(C.getArgs()) && + if (!useIntegratedAs() && getTriple().getEnvironment() == llvm::Triple::MachO) T = new tools::darwin::Assemble(*this); else |