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

[Rafael Espindola]

Author: rafael
Date: Tue Nov  9 23:00:22 2010
New Revision: 118673

URL: http://llvm.org/viewvc/llvm-project?rev=118673&view=rev
Log:
Add support for Ubuntu Jaunty.

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=118673&r1=118672&r2=118673&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Tue Nov  9 23:00:22 2010
@@ -1201,6 +1201,7 @@
   Fedora13,
   Fedora14,
   OpenSuse11_3,
+  UbuntuJaunty,
   UbuntuLucid,
   UbuntuMaverick,
   UnknownDistro
@@ -1219,7 +1220,7 @@
 }
 
 static bool IsUbuntu(enum LinuxDistro Distro) {
-  return Distro == UbuntuLucid || Distro == UbuntuMaverick;
+  return Distro == UbuntuLucid || Distro == UbuntuMaverick || Distro == UbuntuJaunty;
 }
 
 static bool IsDebianBased(enum LinuxDistro Distro) {
@@ -1246,6 +1247,8 @@
         return UbuntuMaverick;
       else if (Lines[i] == "DISTRIB_CODENAME=lucid")
         return UbuntuLucid;
+      else if (Lines[i] == "DISTRIB_CODENAME=jaunty")
+	return UbuntuJaunty;
     }
     return UnknownDistro;
   }
@@ -1330,7 +1333,7 @@
   }
 
   const char* GccVersions[] = {"4.5.1", "4.5", "4.4.5", "4.4.4", "4.4.3",
-                               "4.3.2"};
+                               "4.3.3", "4.3.2"};
   std::string Base = "";
   for (unsigned i = 0; i < sizeof(GccVersions)/sizeof(char*); ++i) {
     std::string Suffix = GccTriple + "/" + GccVersions[i];
@@ -1379,14 +1382,14 @@
   if (IsFedora(Distro) || Distro == UbuntuMaverick)
     ExtraOpts.push_back("--hash-style=gnu");
 
-  if (IsDebian(Distro) || Distro == UbuntuLucid)
+  if (IsDebian(Distro) || Distro == UbuntuLucid || Distro == UbuntuJaunty)
     ExtraOpts.push_back("--hash-style=both");
 
   if (IsFedora(Distro))
     ExtraOpts.push_back("--no-add-needed");
 
-  if (Distro == DebianSqueeze || IsUbuntu(Distro) || IsOpenSuse(Distro) ||
-      IsFedora(Distro))
+  if (Distro == DebianSqueeze || IsOpenSuse(Distro) ||
+      IsFedora(Distro) || Distro == UbuntuLucid || Distro == UbuntuMaverick)
     ExtraOpts.push_back("--build-id");
 
   Paths.push_back(Base + Suffix);