Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix clang version for Ubuntu detection #124

Merged
merged 2 commits into from
Mar 6, 2022
Merged

Fix clang version for Ubuntu detection #124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e19cbf2
Fix clang version for Ubuntu detection
bozaro Nov 25, 2021
513922e
Fix clang 11.0.1 and 11.1.0 ubuntu condition
bozaro Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions toolchain/tools/llvm_release_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ def _major_llvm_version(llvm_version):
def _minor_llvm_version(llvm_version):
return int(llvm_version.split(".")[1])

def _patch_llvm_version(llvm_version):
return int(llvm_version.split(".")[2])

def _darwin(llvm_version, arch):
major_llvm_version = _major_llvm_version(llvm_version)
suffix = "darwin-apple" if major_llvm_version == 9 else "apple-darwin"
Expand All @@ -50,20 +53,29 @@ def _ubuntu_osname(arch, version, major_llvm_version, llvm_version):

os_name = "linux-gnu-ubuntu-16.04"

if version.startswith("20.10") and (llvm_version in ["11.0.1", "11.1.0"]):
os_name = "linux-gnu-ubuntu-20.10"
elif version.startswith("20"):
if major_llvm_version < 11 or llvm_version in ["11.0.1", "11.1.0"]:
# There is no binary packages specifically for 20.04, but those for 18.04 works on
# 20.04
os_name = "linux-gnu-ubuntu-18.04"
elif major_llvm_version > 11:
# release 11.0.0 started providing packaging for ubuntu 20.04.
is_llvm_major_release = (_minor_llvm_version(llvm_version) == 0) and (_patch_llvm_version(llvm_version) == 0)
major_ubuntu_version = int(version.split(".")[0])
if major_ubuntu_version >= 20:
if (not version.startswith("20.04")) and (llvm_version in ["11.0.1", "11.1.0"]):
os_name = "linux-gnu-ubuntu-20.10"
elif is_llvm_major_release and (major_llvm_version >= 11):
os_name = "linux-gnu-ubuntu-20.04"
elif version.startswith("18"):
if llvm_version in ["8.0.0", "9.0.0", "10.0.0"]:
elif is_llvm_major_release and (major_llvm_version >= 8):
os_name = "linux-gnu-ubuntu-18.04"
else:
# There is no binary packages specifically for 20.04, but those for 16.04 works on
# 20.04
os_name = "linux-gnu-ubuntu-16.04"
elif major_ubuntu_version >= 18:
if is_llvm_major_release and (major_llvm_version >= 11):
# There is no binary packages specifically for 18.04, but those for 16.04 works on
# 18.04
os_name = "linux-gnu-ubuntu-16.04"
elif is_llvm_major_release and (major_llvm_version >= 8):
os_name = "linux-gnu-ubuntu-18.04"
else:
# There is no binary packages specifically for 18.04, but those for 16.04 works on
# 18.04
os_name = "linux-gnu-ubuntu-16.04"

return os_name
Expand Down