From c684406e21c988864d24f3fcb515c08a13fcbcc4 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 18 Jan 2025 13:50:47 +0100 Subject: [PATCH] Don't include nonexistent library paths Introduced in 101e90a668ce68365d4a0b292c06525d6d8919c0 to make Minisign build with Zig 0.13. Fixes #153 --- build.zig | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build.zig b/build.zig index da609af..8e376e3 100644 --- a/build.zig +++ b/build.zig @@ -55,8 +55,12 @@ pub fn build(b: *std.Build) !void { minisign.addLibraryPath(.{ .cwd_relative = path }); override_pkgconfig = true; } - minisign.addLibraryPath(.{ .cwd_relative = "/opt/homebrew/lib" }); - minisign.addLibraryPath(.{ .cwd_relative = "/usr/local/lib" }); + minisign.addSystemIncludePath(.{ .cwd_relative = "/opt/homebrew/include" }); + minisign.addSystemIncludePath(.{ .cwd_relative = "/usr/local/include" }); + for ([_][]const u8{ "/opt/homebrew/lib", "/usr/local/lib" }) |path| { + std.fs.accessAbsolute(path, .{}) catch continue; + minisign.addLibraryPath(.{ .cwd_relative = path }); + } minisign.root_module.linkSystemLibrary( "sodium", .{ @@ -66,8 +70,7 @@ pub fn build(b: *std.Build) !void { ); } minisign.addIncludePath(b.path("src")); - minisign.addSystemIncludePath(.{ .cwd_relative = "/opt/homebrew/include" }); - minisign.addSystemIncludePath(.{ .cwd_relative = "/usr/local/include" }); + minisign.root_module.addCMacro("_GNU_SOURCE", "1"); const source_files = &.{ "src/base64.c", "src/get_line.c", "src/helpers.c", "src/minisign.c" }; minisign.addCSourceFiles(.{ .files = source_files });