From b78033f818434e45036bf201df5f7d6cd4916ca4 Mon Sep 17 00:00:00 2001 From: torque Date: Tue, 15 Aug 2023 00:04:44 -0700 Subject: [PATCH] build: move cross-compilation shim into nats-c.build.zig It makes more sense for it to be here. I'm really not sure why I put it in the main build in the first place. --- build.zig | 10 ---------- nats-c.build.zig | 6 +++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/build.zig b/build.zig index c37dafe..4b05bf1 100644 --- a/build.zig +++ b/build.zig @@ -19,20 +19,10 @@ pub fn build(b: *std.Build) void { .optimize = optimize, }); - const tinfo = nats.target_info.target; - const nats_c = nats_build.nats_c_lib( b, .{ .name = "nats-c", .target = target, .optimize = optimize }, ); - switch (tinfo.os.tag) { - .windows => { - if (tinfo.abi != .msvc) { - nats_c.addCSourceFiles(&.{"src/win-crosshack.c"}, &.{"-fno-sanitize=undefined"}); - } - }, - else => {}, - } nats.linkLibrary(nats_c); b.installArtifact(nats); diff --git a/nats-c.build.zig b/nats-c.build.zig index 82bafa7..06d191c 100644 --- a/nats-c.build.zig +++ b/nats-c.build.zig @@ -28,9 +28,13 @@ pub fn nats_c_lib( // lib.addIncludePath(.{ .path = nats_src_prefix ++ "stan" }); // lib.addCSourceFiles(&streaming_sources, &.{"-fno-sanitize=undefined"}); - switch (lib.target_info.target.os.tag) { + const tinfo = lib.target_info.target; + switch (tinfo.os.tag) { .windows => { lib.addCSourceFiles(&win_sources, &.{"-fno-sanitize=undefined"}); + if (tinfo.abi != .msvc) { + lib.addCSourceFiles(&.{"src/win-crosshack.c"}, &.{"-fno-sanitize=undefined"}); + } lib.defineCMacro("_WIN32", null); lib.linkSystemLibrary("Ws2_32"); },