archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 03:44:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build: avoid pkg-config when statically linking LLVM

Browse source 
Fixes stage4 build on NetBSD with pkg-config installed.
This commit is contained in:
Michael Dusan 2026-01-15 10:51:14 +01:00 • committed by Alex Rønne Petersen
parent ac793232ee
commit a8002a8564
No known key found for this signature in database
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
build.zig
View file

@ -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("zstd", .{});
mod.linkSystemLibrary("z", lsl_options);
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("uuid", .{});
mod.linkSystemLibrary("ole32", .{});
mod.linkSystemLibrary("version", lsl_options);
mod.linkSystemLibrary("uuid", lsl_options);
mod.linkSystemLibrary("ole32", lsl_options);
}
}