From 2c8144eb2230543b3a7eff562fbfe90bd08674f2 Mon Sep 17 00:00:00 2001 From: Chris Chua Date: Thu, 21 Nov 2024 19:27:45 +0800 Subject: [PATCH 1/2] upgrade to zig 0.13.0 --- toolchain/private/zig_sdk.bzl | 14 +++++++------- toolchain/zig-wrapper.zig | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/toolchain/private/zig_sdk.bzl b/toolchain/private/zig_sdk.bzl index a328df5..c1b3cf5 100644 --- a/toolchain/private/zig_sdk.bzl +++ b/toolchain/private/zig_sdk.bzl @@ -1,12 +1,12 @@ -VERSION = "0.12.0" +VERSION = "0.13.0" HOST_PLATFORM_SHA256 = { - "linux-aarch64": "754f1029484079b7e0ca3b913a0a2f2a6afd5a28990cb224fe8845e72f09de63", - "linux-x86_64": "c7ae866b8a76a568e2d5cfd31fe89cdb629bdd161fdd5018b29a4a0a17045cad", - "macos-aarch64": "294e224c14fd0822cfb15a35cf39aa14bd9967867999bf8bdfe3db7ddec2a27f", - "macos-x86_64": "4d411bf413e7667821324da248e8589278180dbc197f4f282b7dbb599a689311", - "windows-aarch64": "04c6b92689241ca7a8a59b5f12d2ca2820c09d5043c3c4808b7e93e41c7bf97b", - "windows-x86_64": "2199eb4c2000ddb1fba85ba78f1fcf9c1fb8b3e57658f6a627a8e513131893f5", + "linux-aarch64": "041ac42323837eb5624068acd8b00cd5777dac4cf91179e8dad7a7e90dd0c556", + "linux-x86_64": "d45312e61ebcc48032b77bc4cf7fd6915c11fa16e4aad116b66c9468211230ea", + "macos-aarch64": "46fae219656545dfaf4dce12fb4e8685cec5b51d721beee9389ab4194d43394c", + "macos-x86_64": "8b06ed1091b2269b700b3b07f8e3be3b833000841bae5aa6a09b1a8b4773effd", + "windows-aarch64": "95ff88427af7ba2b4f312f45d2377ce7a033e5e3c620c8caaa396a9aba20efda", + "windows-x86_64": "d859994725ef9402381e557c60bb57497215682e355204d754ee3df75ee3c158", } # Official recommended version. Should use this when we have a usable release. diff --git a/toolchain/zig-wrapper.zig b/toolchain/zig-wrapper.zig index d1d59f9..99be373 100644 --- a/toolchain/zig-wrapper.zig +++ b/toolchain/zig-wrapper.zig @@ -93,7 +93,7 @@ const ParseResults = union(Action) { }; // sub-commands in the same folder as `zig-wrapper` -const sub_commands_target = std.ComptimeStringMap(void, .{ +const sub_commands_target = std.StaticStringMap(void).initComptime(.{ .{"ar"}, .{"ld.lld"}, .{"lld-link"}, From b4ab950eda10a3b6afef8b7c03d1ee728cb0cab7 Mon Sep 17 00:00:00 2001 From: Chris Chua Date: Thu, 21 Nov 2024 21:09:39 +0800 Subject: [PATCH 2/2] fix windows --- toolchain/zig-wrapper.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/zig-wrapper.zig b/toolchain/zig-wrapper.zig index 99be373..70ee41e 100644 --- a/toolchain/zig-wrapper.zig +++ b/toolchain/zig-wrapper.zig @@ -55,7 +55,7 @@ const std = @import("std"); const fs = std.fs; const mem = std.mem; const process = std.process; -const ChildProcess = std.ChildProcess; +const ChildProcess = std.process.Child; const ArrayListUnmanaged = std.ArrayListUnmanaged; const sep = fs.path.sep_str;