upgrade bazel-zig-cc and bring back the original sysroot

This commit is contained in:
Motiejus Jakštys 2022-12-13 18:57:12 +02:00
parent 977f7eb476
commit cda8e6063f

View File

@ -3,13 +3,14 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
## LLVM
BAZEL_TOOLCHAIN_TAG = "0.7.2"
BAZEL_TOOLCHAIN_SHA = "f7aa8e59c9d3cafde6edb372d9bd25fb4ee7293ab20b916d867cd0baaa642529"
http_archive(
name = "com_grail_bazel_toolchain",
canonical_id = BAZEL_TOOLCHAIN_TAG,
sha256 = BAZEL_TOOLCHAIN_SHA,
strip_prefix = "bazel-toolchain-{tag}".format(tag = BAZEL_TOOLCHAIN_TAG),
canonical_id = BAZEL_TOOLCHAIN_TAG,
url = "https://github.com/grailbio/bazel-toolchain/archive/{tag}.tar.gz".format(tag = BAZEL_TOOLCHAIN_TAG),
)
@ -19,7 +20,6 @@ bazel_toolchain_dependencies()
load("@com_grail_bazel_toolchain//toolchain:rules.bzl", "llvm_toolchain")
LLVM_VERSION = "14.0.0"
llvm_toolchain(
@ -37,8 +37,8 @@ filegroup(
visibility = ["//visibility:public"],
)
""",
sha256 = "4498fa8ce2df8830afd88e0bbf7c8d353a13c3f2454abc507a057889075af904",
urls = ["https://dl.jakstys.lt/zig/debian_stretch_amd64_sysroot-padding15353.tar.xz"],
sha256 = "84656a6df544ecef62169cfe3ab6e41bb4346a62d3ba2a045dc5a0a2ecea94a3",
urls = ["https://commondatastorage.googleapis.com/chrome-linux-sysroot/toolchain/2202c161310ffde63729f29d27fe7bb24a0bc540/debian_stretch_amd64_sysroot.tar.xz"],
)
llvm_toolchain(
@ -59,11 +59,11 @@ load("@llvm_toolchain_with_sysroot//:toolchains.bzl", "llvm_register_toolchains"
### ZIG
BAZEL_ZIG_CC_VERSION = "1fb93e089c4e2cfa52ac92f8dae4635c82df6d0a"
BAZEL_ZIG_CC_VERSION = "00e126ec85cf8793b9d2e12d1db540c506bf781a"
http_archive(
name = "bazel-zig-cc",
sha256 = "5ab6451124cad1204558f02c9f88d9642abaf71bb2b1768498dfe6544ea8f653",
sha256 = "45c38497ea2f0ffabccc356cd9d69bdbbeb43f25481de63ab2018b17079eb80c",
strip_prefix = "bazel-zig-cc-{}".format(BAZEL_ZIG_CC_VERSION),
urls = [
"https://git.sr.ht/~motiejus/bazel-zig-cc/archive/{}.tar.gz".format(BAZEL_ZIG_CC_VERSION),