Skip to content

Commit 5d6661b

Browse files
committed
switch to zig-master support
1 parent 7dd1cad commit 5d6661b

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/zig-ci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
submodules: recursive
3030
fetch-depth: 0
3131
- uses: mlugg/setup-zig@v1
32+
with:
33+
version: master
3234
- name: Build Summary ${{ matrix.targets }}
3335
run: zig build --build-file $PWD/tests/build.zig --summary all -freference-trace -Dtarget=${{ matrix.targets }}
3436

@@ -39,5 +41,7 @@ jobs:
3941
steps:
4042
- uses: actions/checkout@v4
4143
- uses: mlugg/setup-zig@v1
44+
with:
45+
version: master
4246
- name: Build Summary x86_64-windows-msvc
4347
run: zig build --build-file $PWD/tests/build.zig --summary all -freference-trace -Dtarget=native-windows-msvc

build.zig

+2-2
Original file line numberDiff line numberDiff line change
@@ -1082,11 +1082,11 @@ fn checkSystemLibrary(compile: *std.Build.Step.Compile, name: []const u8) bool {
10821082
is_linking_libcpp = is_linking_libcpp or (link_libcpp == true);
10831083
}
10841084

1085-
if (compile.rootModuleTarget().is_libc_lib_name(name)) {
1085+
if (std.zig.target.isLibCLibName(compile.rootModuleTarget(), name)) {
10861086
return is_linking_libc;
10871087
}
10881088

1089-
if (compile.rootModuleTarget().is_libcpp_lib_name(name)) {
1089+
if (std.zig.target.isLibCxxLibName(compile.rootModuleTarget(), name)) {
10901090
return is_linking_libcpp;
10911091
}
10921092

0 commit comments

Comments
 (0)