diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-10-25 18:09:41 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-10-25 18:09:41 +0000 |
| commit | 0d2cbc0bd87f16e47a11a3b923f41b0bf1fd1c86 (patch) | |
| tree | e44a867a7569aa0f2ab203711cd322345198a74c | |
| parent | 8761a8f5c0edcc02e2904d646cb0b5ed73d991b5 (diff) | |
| download | bcm5719-llvm-0d2cbc0bd87f16e47a11a3b923f41b0bf1fd1c86.tar.gz bcm5719-llvm-0d2cbc0bd87f16e47a11a3b923f41b0bf1fd1c86.zip | |
Just detect a distro as being fedora or not.
We don't have any checks that depend on the version of fedora, so we can
simplify.
llvm-svn: 193423
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 89938ed22d2..76794535ba8 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -2094,11 +2094,7 @@ enum Distro { RHEL4, RHEL5, RHEL6, - Fedora13, - Fedora14, - Fedora15, - Fedora16, - FedoraRawhide, + Fedora, OpenSUSE, UbuntuHardy, UbuntuIntrepid, @@ -2116,8 +2112,7 @@ enum Distro { }; static bool IsRedhat(enum Distro Distro) { - return (Distro >= Fedora13 && Distro <= FedoraRawhide) || - (Distro >= RHEL4 && Distro <= RHEL6); + return Distro == Fedora || (Distro >= RHEL4 && Distro <= RHEL6); } static bool IsOpenSUSE(enum Distro Distro) { @@ -2160,17 +2155,8 @@ static Distro DetectDistro(llvm::Triple::ArchType Arch) { if (!llvm::MemoryBuffer::getFile("/etc/redhat-release", File)) { StringRef Data = File.get()->getBuffer(); - if (Data.startswith("Fedora release 16")) - return Fedora16; - else if (Data.startswith("Fedora release 15")) - return Fedora15; - else if (Data.startswith("Fedora release 14")) - return Fedora14; - else if (Data.startswith("Fedora release 13")) - return Fedora13; - else if (Data.startswith("Fedora release") && - Data.find("Rawhide") != StringRef::npos) - return FedoraRawhide; + if (Data.startswith("Fedora release")) + return Fedora; else if (Data.startswith("Red Hat Enterprise Linux") && Data.find("release 6") != StringRef::npos) return RHEL6; |

