From: LLVM Packaging Team Date: Mon, 31 Aug 2020 10:28:24 +0000 (+0100) Subject: ubuntu-groovy X-Git-Tag: archive/raspbian/1%10.0.1-5+rpi1^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25b581d74c957103c576d372b5ee9aba7f91c243;p=llvm-toolchain-10.git ubuntu-groovy Gbp-Pq: Name ubuntu-groovy.diff --- diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h index d382cf77a..038d4ce75 100644 --- 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 { diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp index 06707fefc..4d4f18006 100644 --- a/clang/lib/Driver/Distro.cpp +++ b/clang/lib/Driver/Distro.cpp @@ -70,6 +70,7 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS, .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;