From f3d8d92c459169085a110dd955d5e8275794a21f Mon Sep 17 00:00:00 2001 From: Ahmed Zamouche Date: Thu, 1 Sep 2022 00:14:35 +0200 Subject: [PATCH] update llvm v14 --- .../compilers/llvm/impl/llvm_versions.bzl | 41 +++++++++++++++++-- toolchains/compilers/llvm/llvm_repository.bzl | 4 +- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/toolchains/compilers/llvm/impl/llvm_versions.bzl b/toolchains/compilers/llvm/impl/llvm_versions.bzl index 362fea5..e2ea369 100644 --- a/toolchains/compilers/llvm/impl/llvm_versions.bzl +++ b/toolchains/compilers/llvm/impl/llvm_versions.bzl @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -_WINDOWS = { +_WINDOWS_11 = { "full_version": "11.0", "remote_compiler": { "url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-11.1.0/LLVM-11.1.0-win64.exe", @@ -38,9 +38,9 @@ _PLATFORM_SPECIFIC_CONFIGS_11 = { "strip_prefix": "clang+llvm-11.0.1-x86_64-linux-gnu-ubuntu-16.04", }, }, - "windows": _WINDOWS, - "windows server 2019": _WINDOWS, - "windows 10": _WINDOWS, + "windows": _WINDOWS_11, + "windows server 2019": _WINDOWS_11, + "windows 10": _WINDOWS_11, "mac os x": { "full_version": "11.0", "remote_compiler": { @@ -51,8 +51,41 @@ _PLATFORM_SPECIFIC_CONFIGS_11 = { }, } +_WINDOWS_14 = { + "full_version": "14.0", + "remote_compiler": { + "url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/LLVM-14.0.0-win64.exe", + "sha256": "15d52a38436417843a56883730a7e358a8afa0510a003596ee23963339a913f7", + "strip_prefix": "", + }, +} + +_PLATFORM_SPECIFIC_CONFIGS_14 = { + "linux": { + "full_version": "14.0", + "remote_compiler": { + "url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz", + "sha256": "61582215dafafb7b576ea30cc136be92c877ba1f1c31ddbbd372d6d65622fef5", + "strip_prefix": "clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04", + }, + }, + "windows": _WINDOWS_14, + "windows server 2019": _WINDOWS_14, + "windows 10": _WINDOWS_14, + "mac os x": { + "full_version": "14.0", + "remote_compiler": { + "url": "https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/clang+llvm-14.0.0-x86_64-apple-darwin.tar.xz", + "sha256": "cf5af0f32d78dcf4413ef6966abbfd5b1445fe80bba57f2ff8a08f77e672b9b3", + "strip_prefix": "clang+llvm-14.0.0-x86_64-apple-darwin", + }, + }, +} + + TOOLCHAIN_VERSIONS = { "11": _PLATFORM_SPECIFIC_CONFIGS_11, + "14": _PLATFORM_SPECIFIC_CONFIGS_14, } def get_platform_specific_config(version, os_name): diff --git a/toolchains/compilers/llvm/llvm_repository.bzl b/toolchains/compilers/llvm/llvm_repository.bzl index 190f16a..ad2fb58 100644 --- a/toolchains/compilers/llvm/llvm_repository.bzl +++ b/toolchains/compilers/llvm/llvm_repository.bzl @@ -65,8 +65,8 @@ llvm_repository = repository_rule( _llvm_repository_impl, attrs = { "version": attr.string( - default = "11", - doc = "LLVM version, version 11 currently only version supported", + default = "14", + doc = "LLVM version, version 11 and 14 currently only version supported", values = TOOLCHAIN_VERSIONS.keys(), ), "sysroot": attr.label(