From 94a49750312189bb20121337831df829c5bc3fe9 Mon Sep 17 00:00:00 2001 From: Rahul Butani Date: Mon, 13 Sep 2021 00:22:03 -0500 Subject: [PATCH] release_names: some cleanup and a fix --- toolchain/tools/llvm_release_name.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/toolchain/tools/llvm_release_name.py b/toolchain/tools/llvm_release_name.py index 8a657caf..74adf73b 100755 --- a/toolchain/tools/llvm_release_name.py +++ b/toolchain/tools/llvm_release_name.py @@ -77,7 +77,9 @@ def _linux(llvm_version): os_name = "linux-sles%s" % version elif distname == "ubuntu" and version.startswith("14.04"): os_name = "linux-gnu-ubuntu-14.04" - elif (distname == "ubuntu" and version.startswith("20.04")) or (distname == "linuxmint" and version.startswith("20")): + elif ((distname == "ubuntu" and version.startswith("20.04")) or + (distname == "linuxmint" and version.startswith("20")) or + (distname == "pop" and version.startswith("20"))): if major_llvm_version < 11: # There is no binary packages specifically for 20.04, but those for 18.04 works on # 20.04 @@ -85,20 +87,16 @@ def _linux(llvm_version): else: # release 11.0.0 started providing packaging for ubuntu 20 os_name = "linux-gnu-ubuntu-20.04" - elif (distname == "ubuntu" and version.startswith("18.04")) or (distname == "linuxmint" and version.startswith("19")): + elif ((distname == "ubuntu" and version.startswith("18.04")) or + (distname == "linuxmint" and version.startswith("19")) or + (distname == "debian" and (version is None or int(version) == 10))): if major_llvm_version > 10: # LLVM seems to have stopped providing binary packages for ubuntu 18.04. os_name = "linux-gnu-ubuntu-16.04" else: os_name = "linux-gnu-ubuntu-18.04" - - elif (distname == "ubuntu" and version.startswith("20")) or (distname == "pop" and version.startswith("20")): - # use ubuntu 18.04 clang LLVM release for ubuntu 20.04 - os_name = "linux-gnu-ubuntu-18.04" elif distname in ["ubuntu", "manjaro"] or (distname == "linuxmint" and version.startswith("18")): os_name = "linux-gnu-ubuntu-16.04" - elif distname == "debian" and (version is None or int(version) == 10): - os_name = "linux-gnu-ubuntu-18.04" elif distname == "debian" and int(version) == 9 and major_llvm_version >= 7: os_name = "linux-gnu-ubuntu-16.04" elif distname == "debian" and int(version) == 8 and major_llvm_version < 7: