nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the GCC version proliferation worse by N+1 for the sake of

Browse Source 
ArchLinux. =/ Fixes PR10246.

llvm-svn: 134299
This commit is contained in:
Chandler Carruth
2011-07-02 00:51:03 +00:00
parent fb71f4260a
commit 42f96b78ec
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1462,7 +1462,7 @@ static std::string findGCCBaseLibDir(const std::string &GccTriple) {
ret.append(Version); ret.append(Version);
return ret; return ret;
} }
static const char* GccVersions[] = {"4.6.0", "4.6", static const char* GccVersions[] = {"4.6.1", "4.6.0", "4.6",
"4.5.2", "4.5.1", "4.5", "4.5.2", "4.5.1", "4.5",
"4.4.5", "4.4.4", "4.4.3", "4.4", "4.4.5", "4.4.4", "4.4.3", "4.4",
"4.3.4", "4.3.3", "4.3.2", "4.3", "4.3.4", "4.3.3", "4.3.2", "4.3",

4
clang/lib/Frontend/InitHeaderSearch.cpp
View File

@@ -831,6 +831,10 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp
"x86_64-unknown-linux-gnu", "", "", triple); "x86_64-unknown-linux-gnu", "", "", triple);
// Arch Linux gcc 4.6 // Arch Linux gcc 4.6
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.6.1",
"i686-pc-linux-gnu", "", "", triple);
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.6.1",
"x86_64-unknown-linux-gnu", "", "", triple);
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.6.0", AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.6.0",
"i686-pc-linux-gnu", "", "", triple); "i686-pc-linux-gnu", "", "", triple);
AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.6.0", AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.6.0",