use a newer zig and newer bazel-zig-cc

This commit is contained in:
Motiejus Jakštys 2023-04-17 14:29:54 +03:00
parent 255db31ad2
commit 12d6f58ea0
2 changed files with 22 additions and 10 deletions

View File

@ -1 +1 @@
5.4.0 6.1.1

View File

@ -59,28 +59,40 @@ load("@llvm_toolchain_with_sysroot//:toolchains.bzl", "llvm_register_toolchains"
### ZIG ### ZIG
BAZEL_ZIG_CC_VERSION = "v1.0.0-rc4" #BAZEL_ZIG_CC_VERSION = "v1.0.1"
BAZEL_ZIG_CC_VERSION = "60a9f12d67f5b6a5a79d1b45b07ded41cdbb96fe"
http_archive( http_archive(
name = "bazel-zig-cc", name = "bazel-zig-cc",
sha256 = "af784b604c08f385358113dc41e22736369a8ad09951fecf31dd13c35f4aaa62", #sha256 = "e9f82bfb74b3df5ca0e67f4d4989e7f1f7ce3386c295fd7fda881ab91f83e509",
sha256 = "b005e86324022ffe040d47b0bf8216a527b403620cfb7b14c162224c6884afb8",
strip_prefix = "bazel-zig-cc-{}".format(BAZEL_ZIG_CC_VERSION), strip_prefix = "bazel-zig-cc-{}".format(BAZEL_ZIG_CC_VERSION),
urls = [ urls = [
"https://git.sr.ht/~motiejus/bazel-zig-cc/archive/{}.tar.gz".format(BAZEL_ZIG_CC_VERSION), "https://github.com/motiejus/bazel-zig-cc/archive/{}.tar.gz".format(BAZEL_ZIG_CC_VERSION),
#"https://mirror.bazel.build/github.com/uber/bazel-zig-cc/releases/download/{0}/{0}.tar.gz".format(BAZEL_ZIG_CC_VERSION),
#"https://github.com/uber/bazel-zig-cc/releases/download/{0}/{0}.tar.gz".format(BAZEL_ZIG_CC_VERSION),
], ],
) )
load("@bazel-zig-cc//toolchain:defs.bzl", zig_toolchains = "toolchains") load("@bazel-zig-cc//toolchain:defs.bzl", zig_toolchains = "toolchains")
ZIG_VERSION = "0.11.0-dev.2441+eb19f73af-dbgsafe"
ZIG_HASH = "fde61f641a557ec01784c99a62e5e7fde78d17c306280af851f469ff14c1e5a5"
#ZIG_VERSION = "0.11.0-dev.2441+eb19f73af"
#ZIG_HASH = "aa06f10bb1407d83eae790cba6be4721ec3e02e63aa209192a8919fc25db8544"
zig_toolchains( zig_toolchains(
host_platform_sha256 = { host_platform_sha256 = {
"linux-aarch64": "b47358c3db3df92120e4659c86a653acbdb26fbeb11c97479b28634cbc68cd49", "linux-aarch64": "",
"linux-x86_64": "c24550551ac33b78d4f1534ae9dedde5a865c00d9de510e04c9e1e20e77ae18b", "linux-x86_64": ZIG_HASH,
"macos-aarch64": "6fd768eab43dbc2bb3fae92b4c5c4ff538c90819b7c4fdf75bc4f6182d1745b3", "macos-aarch64": "",
"macos-x86_64": "5d227db2a9f89b46a940b229d93a53f5331923e676201f44322c1e2ceb62076f", "macos-x86_64": "",
"windows-x86_64": "b738ae6549d3a1fdefdd98d0e46fb638d1c5a8284e6c5320f72cbac97d202b37", "windows-x86_64": "",
}, },
version = "0.11.0-dev.811+8ff9284c4", url_formats = ["https://dl.jakstys.lt/ntpad/zig/zig-{host_platform}-{version}.{_ext}"],
version = ZIG_VERSION,
#version = "0.11.0-dev.811+8ff9284c4",
) )
register_toolchains( register_toolchains(