Add Ubuntu Cosmic to supported distro (from Adam Conrad)

This commit is contained in:
Gianfranco Costamagna 2018-05-10 09:57:21 +02:00
parent ca9e22174a
commit f7fa260082
3 changed files with 38 additions and 0 deletions

4
debian/changelog vendored
View File

@ -1,7 +1,11 @@
llvm-toolchain-6.0 (1:6.0.1~+rc1-1~exp3) UNRELEASED; urgency=medium
[ Sylvestre Ledru ]
* d/p/force-gcc-header-obj.diff Fix the detection of the objc path
[ Gianfranco Costamagna ]
* Add ubuntu cosmic to Ubuntu supported releases
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 09 May 2018 14:23:49 +0200
llvm-toolchain-6.0 (1:6.0.1~+rc1-1~exp2) experimental; urgency=medium

View File

@ -53,3 +53,4 @@ remove-test-freezing.diff
#install-lldb-sb-headers.patch
0048-Set-html_static_path-_static-everywhere.patch
0049-Use-Debian-provided-MathJax-everywhere.patch
ubuntu-cosmic-support.patch

View File

@ -0,0 +1,33 @@
Description: Add Ubuntu Cosmic to the distro release list.
Author: Adam Conrad <adconrad@ubuntu.com>
Last-Update: 2018-05-03
--- llvm-toolchain-6.0-6.0.orig/clang/include/clang/Driver/Distro.h
+++ llvm-toolchain-6.0-6.0/clang/include/clang/Driver/Distro.h
@@ -61,6 +61,7 @@ public:
UbuntuZesty,
UbuntuArtful,
UbuntuBionic,
+ UbuntuCosmic,
UnknownDistro
};
@@ -114,7 +115,7 @@ public:
}
bool IsUbuntu() const {
- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuBionic;
+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuCosmic;
}
bool IsAlpineLinux() const {
--- llvm-toolchain-6.0-6.0.orig/clang/lib/Driver/Distro.cpp
+++ llvm-toolchain-6.0-6.0/clang/lib/Driver/Distro.cpp
@@ -49,6 +49,7 @@ static Distro::DistroType DetectDistro(v
.Case("zesty", Distro::UbuntuZesty)
.Case("artful", Distro::UbuntuArtful)
.Case("bionic", Distro::UbuntuBionic)
+ .Case("cosmic", Distro::UbuntuCosmic)
.Default(Distro::UnknownDistro);
if (Version != Distro::UnknownDistro)
return Version;