Find all distros.

Drop release_name.bzl.

Author: helly25

toolchain/internal/llvm_distributions.bzl

@@ -19,7 +19,6 @@ load(
     _exec_os_arch_dict_value = "exec_os_arch_dict_value",
     _host_info = "host_info",
 )
-load("//toolchain/internal:release_name.bzl", _llvm_release_name_context = "llvm_release_name_context")
 
 # If a new LLVM version is missing from this list, please add the shasums here
 # and the new version in toolchain/internal/llvm_distributions.golden.txt.
@@ -731,7 +730,14 @@ def _get_llvm_version(rctx):
         )
     return llvm_version
 
-_UBUNTU_NAMES = ["arch", "linuxmint", "manjaro", "nixos", "pop", "ubuntu"]
+_UBUNTU_NAMES = [
+    "arch",
+    "linuxmint",
+    "manjaro",
+    "nixos",
+    "pop",
+    "ubuntu",
+]
 
 _UBUNTU_VERSIONS = [
     "linux-ubuntu-20.04",
@@ -763,7 +769,6 @@ def _dist_to_os_names(dist, default_os_names = []):
             "linux-sles11.3",
             "linux-sles",
             "unknown-linux-gnu-rhel86",
-            "linux-gnu-ubuntu-24.04",
             "linux-gnu-ubuntu-22.04",
             "linux-gnu-ubuntu-20.04",
             "linux-gnu-ubuntu-18.04",
@@ -785,6 +790,10 @@ def _dist_to_os_names(dist, default_os_names = []):
         return ["linux-gnueabihf", "linux-gnu"]
     if dist.name in ["rhel", "ol", "almalinux"]:
         return ["linux-rhel-", "linux-gnu-rhel-"]
+    if dist.name == "debian":
+        return [
+            "linux-gnu-debian8",
+        ] + _UBUNTU_VERSIONS
     if dist.name in _UBUNTU_NAMES:
         return [
             "linux-gnu-ubuntu-" + dist.version,
@@ -945,57 +954,29 @@ def _find_llvm_basename_list(llvm_version, arch, os, dist):
     else:
         fail("ERROR: Unknown OS: {os}".format(os = os))
 
-def _find_llvm_basename_maybe_fail(llvm_version, arch, os, dist, should_fail):
+def _find_llvm_basename_maybe_fail(llvm_version, arch, os, dist):
     basenames = _find_llvm_basename_list(llvm_version, arch, os, dist)
     if len(basenames) > 1:
-        if fail:
-            fail("ERROR: Multiple configurations found [{basenames}].".format(
-                basenames = ", ".join(basenames),
-            ))
-        return None
+        fail("ERROR: Multiple configurations found [{basenames}].".format(
+            basenames = ", ".join(basenames),
+        ))
     if not basenames:
-        if should_fail:
-            fail("ERROR: No matching config could be found for version {llvm_version} on {os}/{dist_name}/{dist_version} with arch {arch}.".format(
-                llvm_version = llvm_version,
-                os = os,
-                dist_name = dist.name,
-                dist_version = dist.version,
-                arch = arch,
-            ))
-        return None
+        fail("ERROR: No matching config could be found for version {llvm_version} on {os}/{dist_name}/{dist_version} with arch {arch}.".format(
+            llvm_version = llvm_version,
+            os = os,
+            dist_name = dist.name,
+            dist_version = dist.version,
+            arch = arch,
+        ))
 
     # Use the following for debugging:
     # print("Found LLVM: " + basenames[0])  # buildifier: disable=print
     return basenames[0]
 
-def _major_llvm_version(llvm_version):
-    """Return the major version given `<major>['.' <minor> [ '.' <mini> [.*]]]."""
-    return int(llvm_version.split(".")[0])
-
-def _host_can_be_found(major_llvm_version, host_info):
-    """Return whether the basename can be found or needs to be predicted."""
-    if major_llvm_version >= 19:
-        return True
-    if host_info.os in ["darwin", "windows"]:
-        return True
-    if _dist_to_os_names(host_info.dist, []):
-        return True
-    if host_info.arch in ["aarch64", "armv7a", "mips", "mipsel"]:
-        return True
-
-    return False
-
 def _llvm_release_name(rctx, llvm_version):
-    """Try to find the distribution in the configured list. Otherwise predict version name by input.
-
-    For versions 19+ or we os==darwin fail if the distribution cannot be found automatically."""
-    major_llvm_version = _major_llvm_version(llvm_version)
+    """Try to find the distribution in the configured list. Otherwise predict version name by input."""
     host_info = _host_info(rctx)
-    should_fail = _host_can_be_found(major_llvm_version, host_info)
-    basename = _find_llvm_basename_maybe_fail(llvm_version, host_info.arch, host_info.os, host_info.dist, should_fail)
-    if basename:
-        return basename
-    return _llvm_release_name_context(rctx, llvm_version)
+    return _find_llvm_basename_maybe_fail(llvm_version, host_info.arch, host_info.os, host_info.dist)
 
 def _distribution_urls(rctx):
     """Return LLVM `urls`, `shha256` and `strip_prefix` for the given context."""
@@ -1073,8 +1054,6 @@ def _write_distributions_impl(ctx):
     dist_dict_list = {
         "linux": [
             # struct(name = "ibm-aix", version = "7.2"),        unreachable
-            # struct(name = "linux-gnu-debian", version = "8"), unreachable
-            # struct(name = "linux-gnu-rhel", version = "8.4"), unreachable
             # keep sorted
             struct(name = "amzn", version = ANY_VER),
             struct(name = "arch", version = ANY_VER),

toolchain/internal/llvm_distributions.golden.out.txt

@@ -63,7 +63,6 @@ version: 20.1.1
 version: 20.1.2
 version: 20.1.3
 del: clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
-del: clang+llvm-6.0.0-x86_64-linux-gnu-debian8.tar.xz
 del: clang+llvm-9.0.0-sparcv9-sun-solaris2.11.tar.xz
 del: clang+llvm-9.0.0-x86_64-pc-linux-gnu.tar.xz
 del: clang+llvm-10.0.0-sparcv9-sun-solaris2.11.tar.xz
@@ -118,3 +117,12 @@ del: clang+llvm-19.1.0-x86_64-pc-windows-msvc.tar.xz
 del: clang+llvm-19.1.1-x86_64-pc-windows-msvc.tar.xz
 del: clang+llvm-19.1.2-x86_64-pc-windows-msvc.tar.xz
 del: clang+llvm-19.1.3-x86_64-pc-windows-msvc.tar.xz
+dup: 15.0.2-x86_64-linux-debian-0 -> 2
+   : clang+llvm-15.0.2-x86_64-unknown-linux-gnu-rhel86.tar.xz
+   : clang+llvm-15.0.2-x86_64-unknown-linux-gnu-sles15.tar.xz
+dup: 15.0.2-x86_64-linux-debian-8 -> 2
+   : clang+llvm-15.0.2-x86_64-unknown-linux-gnu-rhel86.tar.xz
+   : clang+llvm-15.0.2-x86_64-unknown-linux-gnu-sles15.tar.xz
+dup: 15.0.2-x86_64-linux-debian-9 -> 2
+   : clang+llvm-15.0.2-x86_64-unknown-linux-gnu-rhel86.tar.xz
+   : clang+llvm-15.0.2-x86_64-unknown-linux-gnu-sles15.tar.xz