Merge branch 'patch-1' into 'snapshot'

Delete ubuntu-groovy.diff

See merge request pkg-llvm-team/llvm-toolchain!104
This commit is contained in:
Sylvestre Ledru 2023-01-31 10:10:55 +00:00
commit c9eeb57fe7

View File

@ -1,29 +0,0 @@
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -67,6 +67,7 @@ public:
UbuntuDisco,
UbuntuEoan,
UbuntuFocal,
+ UbuntuGroovy,
UnknownDistro
};
@@ -120,7 +121,7 @@ public:
}
bool IsUbuntu() const {
- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuFocal;
+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuGroovy;
}
bool IsAlpineLinux() const {
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -70,6 +70,7 @@ static Distro::DistroType DetectDistro(l
.Case("disco", Distro::UbuntuDisco)
.Case("eoan", Distro::UbuntuEoan)
.Case("focal", Distro::UbuntuFocal)
+ .Case("groovy", Distro::UbuntuGroovy)
.Default(Distro::UnknownDistro);
if (Version != Distro::UnknownDistro)
return Version;