Commit a8002a85649447b3622a81bfcbb27b2ca6d3d482 | zig

author	Michael Dusan <michael.dusan@gmail.com> 2026-01-15 10:51:14+01:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2026-01-19 13:16:33+01:00
log	a8002a85649447b3622a81bfcbb27b2ca6d3d482
tree	0abb6264d1bbc1fb428d075ff91c95bf25430a51
parent	ac793232eeeca87378b6b6cf4bec6e610859b5b1
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

build: avoid pkg-config when statically linking LLVM

Fixes stage4 build on NetBSD with pkg-config installed.

1 files changed, 15 insertions(+), 13 deletions(-)

build.zig

build.zig+15-13

 @@ -958,46 +958,48 @@ fn addStaticLlvmOptionsToModule(mod: *std.Build.Module, options: struct {
         .flags = &zig_cpp_cflags,
     });
+    const lsl_options: std.Build.Module.LinkSystemLibraryOptions = .{ .use_pkg_config = .no };
     for (clang_libs) |lib_name| {
-        mod.linkSystemLibrary(lib_name, .{});
+        mod.linkSystemLibrary(lib_name, lsl_options);
     }
     for (lld_libs) |lib_name| {
-        mod.linkSystemLibrary(lib_name, .{});
+        mod.linkSystemLibrary(lib_name, lsl_options);
     }
     for (llvm_libs) |lib_name| {
-        mod.linkSystemLibrary(lib_name, .{});
+        mod.linkSystemLibrary(lib_name, lsl_options);
     }
     if (options.llvm_has_m68k) for (llvm_libs_m68k) |lib_name| {
-        mod.linkSystemLibrary(lib_name, .{});
+        mod.linkSystemLibrary(lib_name, lsl_options);
     };
     if (options.llvm_has_csky) for (llvm_libs_csky) |lib_name| {
-        mod.linkSystemLibrary(lib_name, .{});
+        mod.linkSystemLibrary(lib_name, lsl_options);
     };
     if (options.llvm_has_arc) for (llvm_libs_arc) |lib_name| {
-        mod.linkSystemLibrary(lib_name, .{});
+        mod.linkSystemLibrary(lib_name, lsl_options);
     };
     if (options.llvm_has_xtensa) for (llvm_libs_xtensa) |lib_name| {
-        mod.linkSystemLibrary(lib_name, .{});
+        mod.linkSystemLibrary(lib_name, lsl_options);
     };
-    mod.linkSystemLibrary("z", .{});
+    mod.linkSystemLibrary("z", lsl_options);
-    mod.linkSystemLibrary("zstd", .{});
+    mod.linkSystemLibrary("zstd", lsl_options);
     if (mod.resolved_target.?.result.os.tag != .windows or mod.resolved_target.?.result.abi != .msvc) {
         // This means we rely on clang-or-zig-built LLVM, Clang, LLD libraries.
-        mod.linkSystemLibrary("c++", .{});
+        mod.linkSystemLibrary("c++", lsl_options);
     }
     if (mod.resolved_target.?.result.os.tag == .windows) {
-        mod.linkSystemLibrary("version", .{});
+        mod.linkSystemLibrary("version", lsl_options);
-        mod.linkSystemLibrary("uuid", .{});
+        mod.linkSystemLibrary("uuid", lsl_options);
-        mod.linkSystemLibrary("ole32", .{});
+        mod.linkSystemLibrary("ole32", lsl_options);
     }
 }