diff options
| author | Tim Northover <tnorthover@apple.com> | 2014-05-22 12:54:24 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2014-05-22 12:54:24 +0000 |
| commit | 36ce1e056cf174119d4529ccc45e7b545a6f8107 (patch) | |
| tree | afeab9087bac7d0d89838a8a97c8ea3fb590bdbf /clang/lib | |
| parent | 2d401f5bb5cb41635012a9de140539c99ca38445 (diff) | |
| download | bcm5719-llvm-36ce1e056cf174119d4529ccc45e7b545a6f8107.tar.gz bcm5719-llvm-36ce1e056cf174119d4529ccc45e7b545a6f8107.zip | |
TMP
llvm-svn: 209433
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index c0829021fc1..5f9b19c3ff7 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -45,6 +45,14 @@ using namespace llvm::opt; MachO::MachO(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) : ToolChain(D, Triple, Args) { + getProgramPaths().push_back(getDriver().getInstalledDir()); + if (getDriver().getInstalledDir() != getDriver().Dir) + getProgramPaths().push_back(getDriver().Dir); + + // We expect 'as', 'ld', etc. to be adjacent to our install dir. + getProgramPaths().push_back(getDriver().getInstalledDir()); + if (getDriver().getInstalledDir() != getDriver().Dir) + getProgramPaths().push_back(getDriver().Dir); } /// Darwin - Darwin tool chain for i386 and x86_64. @@ -232,14 +240,6 @@ Tool *MachO::buildAssembler() const { DarwinClang::DarwinClang(const Driver &D, const llvm::Triple& Triple, const ArgList &Args) : Darwin(D, Triple, Args) { - getProgramPaths().push_back(getDriver().getInstalledDir()); - if (getDriver().getInstalledDir() != getDriver().Dir) - getProgramPaths().push_back(getDriver().Dir); - - // We expect 'as', 'ld', etc. to be adjacent to our install dir. - getProgramPaths().push_back(getDriver().getInstalledDir()); - if (getDriver().getInstalledDir() != getDriver().Dir) - getProgramPaths().push_back(getDriver().Dir); } void DarwinClang::addClangWarningOptions(ArgStringList &CC1Args) const { |
