Skip to content

Commit 16a549b

Browse files
committed
link iconv on windows
1 parent d2c63d4 commit 16a549b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,9 @@ jobs:
3333
run: zig fmt --ast-check --check .
3434

3535
- name: Build
36+
if: matrix.os != 'windows-latest'
3637
run: zig build --summary all
38+
39+
- name: Build (windows)
40+
if: matrix.os == 'windows-latest'
41+
run: zig build -Diconv=false --summary all

build.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ pub fn build(b: *std.Build) void {
193193
if (history) xml_lib.root_module.linkSystemLibrary("history", .{});
194194
if (lzma) xml_lib.root_module.linkSystemLibrary("lzma", .{});
195195
if (icu) xml_lib.root_module.linkSystemLibrary("icu-i18n", .{});
196-
// if (iconv) xml_lib.root_module.linkSystemLibrary("iconv", .{});
196+
if (iconv and target.result.os.tag == .windows) xml_lib.root_module.linkSystemLibrary("iconv", .{});
197197
if (target.result.os.tag == .windows) xml_lib.root_module.linkSystemLibrary("bcrypt", .{});
198198
if (http and target.result.os.tag == .windows) xml_lib.root_module.linkSystemLibrary("ws2_32", .{});
199199

0 commit comments

Comments
 (0)