[cfe-commits] r132550 - /cfe/trunk/lib/Driver/ToolChains.cpp

Rafael Espindola rafael.espindola at gmail.com
Fri Jun 3 08:23:24 PDT 2011


Author: rafael
Date: Fri Jun  3 10:23:24 2011
New Revision: 132550

URL: http://llvm.org/viewvc/llvm-project?rev=132550&view=rev
Log:
Add support for centos.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=132550&r1=132549&r2=132550&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Fri Jun  3 10:23:24 2011
@@ -1201,7 +1201,8 @@
 
 static bool IsRedhat(enum LinuxDistro Distro) {
   return Distro == Fedora13 || Distro == Fedora14 ||
-         Distro == Fedora15 || Distro == FedoraRawhide;
+         Distro == Fedora15 || Distro == FedoraRawhide ||
+         Distro == RHEL4 || Distro == RHEL5 || Distro == RHEL6;
 }
 
 static bool IsOpenSuse(enum LinuxDistro Distro) {
@@ -1281,10 +1282,12 @@
     else if (Data.startswith("Red Hat Enterprise Linux") &&
              Data.find("release 6") != llvm::StringRef::npos)
       return RHEL6;
-    else if (Data.startswith("Red Hat Enterprise Linux") &&
+    else if ((Data.startswith("Red Hat Enterprise Linux") ||
+	      Data.startswith("CentOS")) &&
              Data.find("release 5") != llvm::StringRef::npos)
       return RHEL5;
-    else if (Data.startswith("Red Hat Enterprise Linux") &&
+    else if ((Data.startswith("Red Hat Enterprise Linux") ||
+	      Data.startswith("CentOS")) &&
              Data.find("release 4") != llvm::StringRef::npos)
       return RHEL4;
     return UnknownDistro;
@@ -1500,7 +1503,9 @@
     ExtraOpts.push_back("--no-add-needed");
 
   if (Distro == DebianSqueeze || Distro == DebianWheezy ||
-      IsOpenSuse(Distro) || IsRedhat(Distro) || Distro == UbuntuLucid ||
+      IsOpenSuse(Distro) ||
+      (IsRedhat(Distro) && Distro != RHEL4 && Distro != RHEL5) ||
+      Distro == UbuntuLucid ||
       Distro == UbuntuMaverick || Distro == UbuntuKarmic ||
       Distro == UbuntuNatty)
     ExtraOpts.push_back("--build-id");





More information about the cfe-commits mailing list