From 1a4baf4f092b2c2530b3cde4b511eac3c893c7ba Mon Sep 17 00:00:00 2001 From: Steven Casagrande Date: Tue, 27 Feb 2024 10:10:44 -0500 Subject: [PATCH] Add support for Oracle Linux --- toolchain/internal/common.bzl | 2 +- toolchain/internal/release_name.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/internal/common.bzl b/toolchain/internal/common.bzl index bb1a0b35..53689be7 100644 --- a/toolchain/internal/common.bzl +++ b/toolchain/internal/common.bzl @@ -34,7 +34,7 @@ def host_os_key(rctx): else: return "%s-%s-%s" % (os, version, arch) -_known_distros = ["freebsd", "suse", "ubuntu", "arch", "manjaro", "debian", "fedora", "centos", "amzn", "raspbian", "pop", "rhel"] +_known_distros = ["freebsd", "suse", "ubuntu", "arch", "manjaro", "debian", "fedora", "centos", "amzn", "raspbian", "pop", "rhel", "ol"] def _linux_dist(rctx): res = rctx.execute(["cat", "/etc/os-release"]) diff --git a/toolchain/internal/release_name.bzl b/toolchain/internal/release_name.bzl index 3da4fb6a..2dda47f8 100755 --- a/toolchain/internal/release_name.bzl +++ b/toolchain/internal/release_name.bzl @@ -137,7 +137,7 @@ def _linux(llvm_version, distname, version, arch): elif distname == "raspbian": arch = "armv7a" os_name = "linux-gnueabihf" - elif distname == "rhel": + elif distname in ["rhel", "ol"]: if 8 <= float(version) and float(version) < 9: os_name = _ubuntu_osname(arch, "18.04", major_llvm_version, llvm_version) elif float(version) >= 9: