diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2011-05-19 13:26:33 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2011-05-19 13:26:33 +0000 |
| commit | b8f65e25d8e1a9e45bee589a9238cf6fe8363b88 (patch) | |
| tree | 97fa428b449facaf3b3dfeb9c79cd3db57c6f530 /clang/lib/Driver/ToolChains.cpp | |
| parent | f62a8d0fb7c2b26e9a430131f37aeff4c58ac3c9 (diff) | |
| download | bcm5719-llvm-b8f65e25d8e1a9e45bee589a9238cf6fe8363b88.tar.gz bcm5719-llvm-b8f65e25d8e1a9e45bee589a9238cf6fe8363b88.zip | |
- Fixes openSUSE detection for 11.4 and upcoming 12.1
- Adds gcc 4.6 to gcc list so that linking will work on openSUSE 12.1
Patch by İsmail Dönmez!
llvm-svn: 131637
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 13e42dae6c8..68c0146a3d2 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -1179,6 +1179,8 @@ enum LinuxDistro { Fedora15, FedoraRawhide, OpenSuse11_3, + OpenSuse11_4, + OpenSuse12_1, UbuntuHardy, UbuntuIntrepid, UbuntuJaunty, @@ -1195,7 +1197,8 @@ static bool IsFedora(enum LinuxDistro Distro) { } static bool IsOpenSuse(enum LinuxDistro Distro) { - return Distro == OpenSuse11_3; + return Distro == OpenSuse11_3 || Distro == OpenSuse11_4 || + Distro == OpenSuse12_1; } static bool IsDebian(enum LinuxDistro Distro) { @@ -1281,6 +1284,10 @@ static LinuxDistro DetectLinuxDistro(llvm::Triple::ArchType Arch) { llvm::StringRef Data = File.get()->getBuffer(); if (Data.startswith("openSUSE 11.3")) return OpenSuse11_3; + else if (Data.startswith("openSUSE 11.4")) + return OpenSuse11_4; + else if (Data.startswith("openSUSE 12.1")) + return OpenSuse12_1; return UnknownDistro; } @@ -1376,7 +1383,7 @@ Linux::Linux(const HostInfo &Host, const llvm::Triple &Triple) GccTriple = "powerpc64-unknown-linux-gnu"; } - const char* GccVersions[] = {"4.6.0", + const char* GccVersions[] = {"4.6.0", "4.6", "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", |

