Skip to content

Commit

Permalink
switch to zig-master support
Browse files Browse the repository at this point in the history
  • Loading branch information
kassane committed Dec 14, 2024
1 parent 7dd1cad commit 5d6661b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/zig-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
submodules: recursive
fetch-depth: 0
- uses: mlugg/setup-zig@v1
with:
version: master
- name: Build Summary ${{ matrix.targets }}
run: zig build --build-file $PWD/tests/build.zig --summary all -freference-trace -Dtarget=${{ matrix.targets }}

Expand All @@ -39,5 +41,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: mlugg/setup-zig@v1
with:
version: master
- name: Build Summary x86_64-windows-msvc
run: zig build --build-file $PWD/tests/build.zig --summary all -freference-trace -Dtarget=native-windows-msvc
4 changes: 2 additions & 2 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1082,11 +1082,11 @@ fn checkSystemLibrary(compile: *std.Build.Step.Compile, name: []const u8) bool {
is_linking_libcpp = is_linking_libcpp or (link_libcpp == true);
}

if (compile.rootModuleTarget().is_libc_lib_name(name)) {
if (std.zig.target.isLibCLibName(compile.rootModuleTarget(), name)) {
return is_linking_libc;
}

if (compile.rootModuleTarget().is_libcpp_lib_name(name)) {
if (std.zig.target.isLibCxxLibName(compile.rootModuleTarget(), name)) {
return is_linking_libcpp;
}

Expand Down

0 comments on commit 5d6661b

Please sign in to comment.