]> granicus.if.org Git - clang/commitdiff
Driver: Recognize CentOS 6 as RHEL 6.
authorBenjamin Kramer <benny.kra@googlemail.com>
Mon, 5 May 2014 12:39:32 +0000 (12:39 +0000)
committerBenjamin Kramer <benny.kra@googlemail.com>
Mon, 5 May 2014 12:39:32 +0000 (12:39 +0000)
Patch by Dimitry Andric!

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@207963 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/ToolChains.cpp

index d8ed34ff6e65f7bab77754476f94f8b5bed074ae..6e741c6ab2f77ce0c0b12a8d6865a77be5e6f9ad 100644 (file)
@@ -2791,17 +2791,15 @@ static Distro DetectDistro(llvm::Triple::ArchType Arch) {
     StringRef Data = File.get()->getBuffer();
     if (Data.startswith("Fedora release"))
       return Fedora;
-    else if (Data.startswith("Red Hat Enterprise Linux") &&
-             Data.find("release 6") != StringRef::npos)
-      return RHEL6;
-    else if ((Data.startswith("Red Hat Enterprise Linux") ||
-              Data.startswith("CentOS")) &&
-             Data.find("release 5") != StringRef::npos)
-      return RHEL5;
-    else if ((Data.startswith("Red Hat Enterprise Linux") ||
-              Data.startswith("CentOS")) &&
-             Data.find("release 4") != StringRef::npos)
-      return RHEL4;
+    if (Data.startswith("Red Hat Enterprise Linux") ||
+        Data.startswith("CentOS")) {
+      if (Data.find("release 6") != StringRef::npos)
+        return RHEL6;
+      else if (Data.find("release 5") != StringRef::npos)
+        return RHEL5;
+      else if (Data.find("release 4") != StringRef::npos)
+        return RHEL4;
+    }
     return UnknownDistro;
   }