diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index ed9e275f7b0..711b7dbe181 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1523,8 +1523,7 @@ std::string Driver::GetProgramPath(const char *Name, const ToolChain &TC, if (!P.empty()) return P.str(); - P = llvm::sys::Path(llvm::sys::Program::FindProgramByName( - TargetSpecificExecutable)); + P = llvm::sys::Path(llvm::sys::Program::FindProgramByName(Name)); if (!P.empty()) return P.str(); diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index f3db0a87c31..a2efb08fba4 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -1519,7 +1519,7 @@ static std::string findGCCBaseLibDir(const Driver &D, bool Exists; llvm::SmallVector<std::string, 8> Paths(D.PrefixDirs.begin(), D.PrefixDirs.end()); - Paths.push_back("/usr/"); + Paths.push_back("/usr/lib/"); const std::string *Triples[] = {&GccTriple, &D.DefaultHostTriple}; for (llvm::SmallVector<std::string, 8>::const_iterator it = Paths.begin(), ie = Paths.end(); it != ie; ++it) { |
