@@ -27,7 +27,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.8")
2727bazel_dep (name = "rules_kotlin" , version = "2.1.9" )
2828bazel_dep (name = "rules_license" , version = "1.0.0" )
2929bazel_dep (name = "rules_pkg" , version = "1.1.0" )
30- bazel_dep (name = "toolchains_llvm" , version = "0.10.3 " )
30+ bazel_dep (name = "toolchains_llvm" , version = "1.5.0 " )
3131
3232################################################################################
3333# Maven dependencies
@@ -419,19 +419,14 @@ register_toolchains("//bazel/toolchains:kotlin_toolchain")
419419
420420# Used in CI.
421421llvm = use_extension ("@toolchains_llvm//toolchain/extensions:llvm.bzl" , "llvm" )
422- llvm .toolchain (
423- llvm_version = "15.0.6" ,
424- sysroot = {
425- # The extension doesn't handle labels to external repositories correctly: It does not map
426- # apparent names such as @org_chromium_sysroot_linux_x64 to the correct Bazel-internal
427- # canonical repository name. As a workaround, specify the canonical name directly.
428- # TODO: Get rid on this dependency of Bazel implementation details when toolchains_llvm
429- # offers an attribute of type label rather than string.
430- # https://github.com/grailbio/bazel-toolchain/issues/234
431- # https://github.com/grailbio/bazel-toolchain/pull/235
432- "linux-x86_64" : "@@_main~_repo_rules~org_chromium_sysroot_linux_x64//:sysroot" ,
433- "linux-aarch64" : "@@_main~_repo_rules~org_chromium_sysroot_linux_aarch64//:sysroot" ,
434- },
422+ llvm .toolchain (llvm_version = "15.0.6" )
423+ llvm .sysroot (
424+ label = "@org_chromium_sysroot_linux_x64//:sysroot" ,
425+ targets = ["linux-x86_64" ],
426+ )
427+ llvm .sysroot (
428+ label = "@org_chromium_sysroot_linux_aarch64//:sysroot" ,
429+ targets = ["linux-aarch64" ],
435430)
436431use_repo (llvm , "llvm_toolchain" )
437432
0 commit comments