diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2011-08-29 18:56:43 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2011-08-29 18:56:43 +0000 |
| commit | b1f2f4782097ed5e0a760598cbb853864cf9d7ce (patch) | |
| tree | cecd5272edaec1fd6e856bb0bceb9a01a3e00ed5 | |
| parent | 10af87932fe4bffad539b24d512a33a1803daeae (diff) | |
Some minor updates to the Linux search path handling for Slackware. Patch by Will Dietz. PR10692.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138753 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/InitHeaderSearch.cpp | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index efd9deefe7..81ff10b7d0 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -1492,7 +1492,7 @@ static std::string findGCCBaseLibDir(const std::string &GccTriple) { return ret; } static const char* GccVersions[] = {"4.6.1", "4.6.0", "4.6", - "4.5.2", "4.5.1", "4.5", + "4.5.3", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 86aa23aa01..08af532267 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -840,6 +840,17 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.6.0", "x86_64-unknown-linux-gnu", "", "", triple); + // Slackware gcc 4.5.2 (13.37) + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.5.2", + "i486-slackware-linux", "", "", triple); + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.5.2", + "x86_64-slackware-linux", "", "", triple); + // Slackware gcc 4.5.3 (-current) + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.5.3", + "i486-slackware-linux", "", "", triple); + AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.5.3", + "x86_64-slackware-linux", "", "", triple); + // Gentoo x86 gcc 4.5.2 AddGnuCPlusPlusIncludePaths( "/usr/lib/gcc/i686-pc-linux-gnu/4.5.2/include/g++-v4", |