factotum/nats.zig
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: move cross-compilation shim into nats-c.build.zig

Browse Source 
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.
This commit is contained in:
torque 2023-08-15 00:04:44 -07:00
parent fbb45f1567
commit b78033f818
Signed by: torque
SSH Key Fingerprint: SHA256:nCrXefBNo6EbjNSQhv0nXmEg/VuNq3sMF5b8zETw3Tk
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.zig
View File

@ -19,20 +19,10 @@ pub fn build(b: *std.Build) void {
.optimize = optimize, .optimize = optimize,
}); });
const tinfo = nats.target_info.target;
const nats_c = nats_build.nats_c_lib( const nats_c = nats_build.nats_c_lib(
b, b,
.{ .name = "nats-c", .target = target, .optimize = optimize }, .{ .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); nats.linkLibrary(nats_c);
b.installArtifact(nats); b.installArtifact(nats);

6
nats-c.build.zig
View File

@ -28,9 +28,13 @@ pub fn nats_c_lib(
// lib.addIncludePath(.{ .path = nats_src_prefix ++ "stan" }); // lib.addIncludePath(.{ .path = nats_src_prefix ++ "stan" });
// lib.addCSourceFiles(&streaming_sources, &.{"-fno-sanitize=undefined"}); // 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 => { .windows => {
lib.addCSourceFiles(&win_sources, &.{"-fno-sanitize=undefined"}); 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.defineCMacro("_WIN32", null);
lib.linkSystemLibrary("Ws2_32"); lib.linkSystemLibrary("Ws2_32");
}, },