replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Driver: use correct search paths for multilib 

llvm-svn: 140782
This commit is contained in:
Peter Collingbourne 2011-09-29 13:42:24 +00:00
parent 0c06e58fae
commit 3e7644af27
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Driver/ToolChains.cpp
View File

@ -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;