diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2011-09-29 13:42:24 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2011-09-29 13:42:24 +0000 |
| commit | a95b9f6dab394fea8378702e1a3d06e3cdfdc9c4 (patch) | |
| tree | 2c0506eec14ce30a9170fa708ae8f6020f79730d /lib/Driver/ToolChains.cpp | |
| parent | fe98da0fa352462c02db037360788748f95466f7 (diff) | |
Driver: use correct search paths for multilib
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140782 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/ToolChains.cpp')
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index a2efb08fba..306be65ed4 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -1519,14 +1519,14 @@ 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/lib/"); + Paths.push_back("/usr/"); const std::string *Triples[] = {&GccTriple, &D.DefaultHostTriple}; for (llvm::SmallVector<std::string, 8>::const_iterator it = Paths.begin(), ie = Paths.end(); it != ie; ++it) { for (unsigned i = 0; i < sizeof(GccVersions)/sizeof(char*); ++i) { for (unsigned j = 0; j < sizeof(Triples)/sizeof(Triples[0]); ++j) { std::string Suffix = *Triples[j] + "/" + GccVersions[i]; - std::string t1 = *it + "gcc/" + Suffix; + std::string t1 = *it + "lib/gcc/" + Suffix; if (!llvm::sys::fs::exists(t1 + "/crtbegin.o", Exists) && Exists) return t1; std::string t2 = *it + "lib64/gcc/" + Suffix; |