Skip to content

Conversation

brad0
Copy link
Contributor

@brad0 brad0 commented Oct 10, 2025

After 07ca4db remove support
for really old and older Ubunutu (Hardy and Intrepid) releases.

After 07ca4db remove support
for really old and older Ubuntu releases.
@llvmbot llvmbot added clang Clang issues not falling into any other category clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' labels Oct 10, 2025
@llvmbot
Copy link
Member

llvmbot commented Oct 10, 2025

@llvm/pr-subscribers-clang

Author: Brad Smith (brad0)

Changes

After 07ca4db remove support
for really old and older Ubunutu releases.


Full diff: https://github.com/llvm/llvm-project/pull/162778.diff

2 Files Affected:

  • (modified) clang/include/clang/Driver/Distro.h (+1-6)
  • (modified) clang/lib/Driver/Distro.cpp (-5)
diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
index 5c25592e68ade..008de0dc94b03 100644
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -48,11 +48,6 @@ class Distro {
     Fedora,
     Gentoo,
     OpenSUSE,
-    UbuntuHardy,
-    UbuntuIntrepid,
-    UbuntuJaunty,
-    UbuntuKarmic,
-    UbuntuLucid,
     UbuntuMaverick,
     UbuntuNatty,
     UbuntuOneiric,
@@ -135,7 +130,7 @@ class Distro {
   }
 
   bool IsUbuntu() const {
-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuQuesting;
+    return DistroVal >= UbuntuMaverick && DistroVal <= UbuntuQuesting;
   }
 
   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
index 90e5a390be7eb..8a5a9fc3026a3 100644
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -61,11 +61,6 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) {
     if (Version == Distro::UnknownDistro &&
         Line.starts_with("DISTRIB_CODENAME="))
       Version = llvm::StringSwitch<Distro::DistroType>(Line.substr(17))
-                    .Case("hardy", Distro::UbuntuHardy)
-                    .Case("intrepid", Distro::UbuntuIntrepid)
-                    .Case("jaunty", Distro::UbuntuJaunty)
-                    .Case("karmic", Distro::UbuntuKarmic)
-                    .Case("lucid", Distro::UbuntuLucid)
                     .Case("maverick", Distro::UbuntuMaverick)
                     .Case("natty", Distro::UbuntuNatty)
                     .Case("oneiric", Distro::UbuntuOneiric)

@llvmbot
Copy link
Member

llvmbot commented Oct 10, 2025

@llvm/pr-subscribers-clang-driver

Author: Brad Smith (brad0)

Changes

After 07ca4db remove support
for really old and older Ubunutu releases.


Full diff: https://github.com/llvm/llvm-project/pull/162778.diff

2 Files Affected:

  • (modified) clang/include/clang/Driver/Distro.h (+1-6)
  • (modified) clang/lib/Driver/Distro.cpp (-5)
diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
index 5c25592e68ade..008de0dc94b03 100644
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -48,11 +48,6 @@ class Distro {
     Fedora,
     Gentoo,
     OpenSUSE,
-    UbuntuHardy,
-    UbuntuIntrepid,
-    UbuntuJaunty,
-    UbuntuKarmic,
-    UbuntuLucid,
     UbuntuMaverick,
     UbuntuNatty,
     UbuntuOneiric,
@@ -135,7 +130,7 @@ class Distro {
   }
 
   bool IsUbuntu() const {
-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuQuesting;
+    return DistroVal >= UbuntuMaverick && DistroVal <= UbuntuQuesting;
   }
 
   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
index 90e5a390be7eb..8a5a9fc3026a3 100644
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -61,11 +61,6 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) {
     if (Version == Distro::UnknownDistro &&
         Line.starts_with("DISTRIB_CODENAME="))
       Version = llvm::StringSwitch<Distro::DistroType>(Line.substr(17))
-                    .Case("hardy", Distro::UbuntuHardy)
-                    .Case("intrepid", Distro::UbuntuIntrepid)
-                    .Case("jaunty", Distro::UbuntuJaunty)
-                    .Case("karmic", Distro::UbuntuKarmic)
-                    .Case("lucid", Distro::UbuntuLucid)
                     .Case("maverick", Distro::UbuntuMaverick)
                     .Case("natty", Distro::UbuntuNatty)
                     .Case("oneiric", Distro::UbuntuOneiric)

@brad0 brad0 requested a review from MaskRay October 10, 2025 05:11
@brad0 brad0 merged commit cadddaf into llvm:main Oct 10, 2025
13 checks passed
@brad0 brad0 deleted the clang_distro branch October 10, 2025 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants