Skip to content

Commit

Permalink
Allow debian to use LLVM 18 (#394)
Browse files Browse the repository at this point in the history
No ubuntu 20.04 bundles are produced for LLVM 18, thus the check binding
to ubuntu 20.04 fails and complains there are no versions possible. Just
going by the ubuntu and debian release timelines debian >=9 should be
compatible with ubuntu 18 but >=8 might also work. For now not breaking
the existing >=9 check just using 18.04 when LLVM 18 is requested.
  • Loading branch information
TylerSeanRau authored Sep 23, 2024
1 parent cd138e1 commit 4ab573b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions toolchain/internal/release_name.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def _ubuntu_osname(arch, version, major_llvm_version, llvm_version):
os_name = "linux-gnu-ubuntu-22.04"
elif llvm_version in ["16.0.1"]:
os_name = "linux-gnu-ubuntu-20.04"
elif llvm_version in ["18.1.4", "15.0.6", "15.0.5", "13.0.1"]:
elif llvm_version in ["18.1.8", "18.1.7", "18.1.4", "15.0.6", "15.0.5", "13.0.1"]:
os_name = "linux-gnu-ubuntu-18.04"
elif llvm_version in ["15.0.2"]:
os_name = "unknown-linux-gnu-rhel86"
Expand Down Expand Up @@ -163,7 +163,10 @@ def _linux(llvm_version, distname, version, arch):
if version.isdigit():
int_version = int(version)
if int_version == 0 or int_version >= 9:
os_name = _ubuntu_osname(arch, "20.04", major_llvm_version, llvm_version)
if major_llvm_version == 18:
os_name = _ubuntu_osname(arch, "18.04", major_llvm_version, llvm_version)
else:
os_name = _ubuntu_osname(arch, "20.04", major_llvm_version, llvm_version)
elif int_version == 8 and major_llvm_version < 7:
os_name = "linux-gnu-debian8"
elif ((distname == "fedora" and int(version) >= 27) or
Expand Down

0 comments on commit 4ab573b

Please sign in to comment.