| ... | ... | @@ -958,46 +958,48 @@ fn addStaticLlvmOptionsToModule(mod: *std.Build.Module, options: struct { |
| 958 | 958 | .flags = &zig_cpp_cflags, |
| 959 | 959 | }); |
| 960 | 960 | |
| 961 | const lsl_options: std.Build.Module.LinkSystemLibraryOptions = .{ .use_pkg_config = .no }; |
| 962 | |
| 961 | 963 | for (clang_libs) |lib_name| { |
| 962 | | mod.linkSystemLibrary(lib_name, .{}); |
| 964 | mod.linkSystemLibrary(lib_name, lsl_options); |
| 963 | 965 | } |
| 964 | 966 | |
| 965 | 967 | for (lld_libs) |lib_name| { |
| 966 | | mod.linkSystemLibrary(lib_name, .{}); |
| 968 | mod.linkSystemLibrary(lib_name, lsl_options); |
| 967 | 969 | } |
| 968 | 970 | |
| 969 | 971 | for (llvm_libs) |lib_name| { |
| 970 | | mod.linkSystemLibrary(lib_name, .{}); |
| 972 | mod.linkSystemLibrary(lib_name, lsl_options); |
| 971 | 973 | } |
| 972 | 974 | |
| 973 | 975 | if (options.llvm_has_m68k) for (llvm_libs_m68k) |lib_name| { |
| 974 | | mod.linkSystemLibrary(lib_name, .{}); |
| 976 | mod.linkSystemLibrary(lib_name, lsl_options); |
| 975 | 977 | }; |
| 976 | 978 | |
| 977 | 979 | if (options.llvm_has_csky) for (llvm_libs_csky) |lib_name| { |
| 978 | | mod.linkSystemLibrary(lib_name, .{}); |
| 980 | mod.linkSystemLibrary(lib_name, lsl_options); |
| 979 | 981 | }; |
| 980 | 982 | |
| 981 | 983 | if (options.llvm_has_arc) for (llvm_libs_arc) |lib_name| { |
| 982 | | mod.linkSystemLibrary(lib_name, .{}); |
| 984 | mod.linkSystemLibrary(lib_name, lsl_options); |
| 983 | 985 | }; |
| 984 | 986 | |
| 985 | 987 | if (options.llvm_has_xtensa) for (llvm_libs_xtensa) |lib_name| { |
| 986 | | mod.linkSystemLibrary(lib_name, .{}); |
| 988 | mod.linkSystemLibrary(lib_name, lsl_options); |
| 987 | 989 | }; |
| 988 | 990 | |
| 989 | | mod.linkSystemLibrary("z", .{}); |
| 990 | | mod.linkSystemLibrary("zstd", .{}); |
| 991 | mod.linkSystemLibrary("z", lsl_options); |
| 992 | mod.linkSystemLibrary("zstd", lsl_options); |
| 991 | 993 | |
| 992 | 994 | if (mod.resolved_target.?.result.os.tag != .windows or mod.resolved_target.?.result.abi != .msvc) { |
| 993 | 995 | // This means we rely on clang-or-zig-built LLVM, Clang, LLD libraries. |
| 994 | | mod.linkSystemLibrary("c++", .{}); |
| 996 | mod.linkSystemLibrary("c++", lsl_options); |
| 995 | 997 | } |
| 996 | 998 | |
| 997 | 999 | if (mod.resolved_target.?.result.os.tag == .windows) { |
| 998 | | mod.linkSystemLibrary("version", .{}); |
| 999 | | mod.linkSystemLibrary("uuid", .{}); |
| 1000 | | mod.linkSystemLibrary("ole32", .{}); |
| 1000 | mod.linkSystemLibrary("version", lsl_options); |
| 1001 | mod.linkSystemLibrary("uuid", lsl_options); |
| 1002 | mod.linkSystemLibrary("ole32", lsl_options); |
| 1001 | 1003 | } |
| 1002 | 1004 | } |
| 1003 | 1005 | |
Michael Dusan <michael.dusan@gmail.com> 2026-01-15 10:51:14+01:00
Alex Rønne Petersen <alex@alexrp.com> 2026-01-19 13:16:33+01:00
Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM