From 01d8eaed85652249c02298215cf3a9e49a1eb16a Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Mon, 5 May 2014 12:39:32 +0000 Subject: [PATCH] Driver: Recognize CentOS 6 as RHEL 6. 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 | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index d8ed34ff6e..6e741c6ab2 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -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; } -- 2.40.0