From 5429418cb06455d867f24b2c7cf2477357a4418c Mon Sep 17 00:00:00 2001 From: Raul Tambre Date: Sun, 4 May 2025 20:55:49 +0300 Subject: [PATCH] [clang] Add support for Debian 14 Forky and Debian 15 Duke (#138460) Futureproofs our single Debian-specific special case for roughly the next 6 years. See: https://lists.debian.org/debian-devel-announce/2025/01/msg00004.html (cherry picked from commit 58e6883c8b6e571d6bd774645ee2b6348cfed6ba) --- clang/include/clang/Driver/Distro.h | 4 +++- clang/lib/Driver/Distro.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h index b4d485dac8a26..c544a8c002191 100644 --- a/clang/include/clang/Driver/Distro.h +++ b/clang/include/clang/Driver/Distro.h @@ -39,6 +39,8 @@ class Distro { DebianBullseye, DebianBookworm, DebianTrixie, + DebianForky, + DebianDuke, Exherbo, RHEL5, RHEL6, @@ -128,7 +130,7 @@ class Distro { bool IsOpenSUSE() const { return DistroVal == OpenSUSE; } bool IsDebian() const { - return DistroVal >= DebianLenny && DistroVal <= DebianTrixie; + return DistroVal >= DebianLenny && DistroVal <= DebianDuke; } bool IsUbuntu() const { diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp index 3cc79535de8da..71ba71fa18379 100644 --- a/clang/lib/Driver/Distro.cpp +++ b/clang/lib/Driver/Distro.cpp @@ -160,6 +160,10 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) { return Distro::DebianBookworm; case 13: return Distro::DebianTrixie; + case 14: + return Distro::DebianForky; + case 15: + return Distro::DebianDuke; default: return Distro::UnknownDistro; } @@ -173,6 +177,8 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) { .Case("bullseye/sid", Distro::DebianBullseye) .Case("bookworm/sid", Distro::DebianBookworm) .Case("trixie/sid", Distro::DebianTrixie) + .Case("forky/sid", Distro::DebianForky) + .Case("duke/sid", Distro::DebianDuke) .Default(Distro::UnknownDistro); }