From 127b0921baa01c6fc256a5349ad174fc8d50652e Mon Sep 17 00:00:00 2001 From: Michael Dusan Date: Sat, 1 Feb 2025 12:14:37 -0500 Subject: [PATCH] openbsd: fix stage3 link - llvm requires libexecinfo which has conflicting symbols with libc++abi - workaround is to link c++abi dynamically --- build.zig | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/build.zig b/build.zig index e53135ccdfa685ef38980a4ae8d37ee1c1f2ce75..9b3effc27ac9b2dffdc9f8ce458cd3f2ad151f53 100644 --- a/build.zig +++ b/build.zig @@ -791,24 +791,19 @@ fn addCmakeCfgOptionsToExe( if (target.abi != .msvc) mod.link_libcpp = true; }, .freebsd => { - if (static) { - try addCxxKnownPath(b, cfg, exe, b.fmt("libc++.{s}", .{lib_suffix}), null, need_cpp_includes); - try addCxxKnownPath(b, cfg, exe, b.fmt("libgcc_eh.{s}", .{lib_suffix}), null, need_cpp_includes); - } else { - try addCxxKnownPath(b, cfg, exe, b.fmt("libc++.{s}", .{lib_suffix}), null, need_cpp_includes); - } - }, - .openbsd => { try addCxxKnownPath(b, cfg, exe, b.fmt("libc++.{s}", .{lib_suffix}), null, need_cpp_includes); - try addCxxKnownPath(b, cfg, exe, b.fmt("libc++abi.{s}", .{lib_suffix}), null, need_cpp_includes); + if (static) try addCxxKnownPath(b, cfg, exe, b.fmt("libgcc_eh.{s}", .{lib_suffix}), null, need_cpp_includes); + }, + .openbsd => { + // - llvm requires libexecinfo which has conflicting symbols with libc++abi + // - only an issue with .a linking + // - workaround is to link c++abi dynamically + try addCxxKnownPath(b, cfg, exe, b.fmt("libc++.{s}", .{target.dynamicLibSuffix()[1..]}), null, need_cpp_includes); + try addCxxKnownPath(b, cfg, exe, b.fmt("libc++abi.{s}", .{target.dynamicLibSuffix()[1..]}), null, need_cpp_includes); }, .netbsd, .dragonfly => { - if (static) { - try addCxxKnownPath(b, cfg, exe, b.fmt("libstdc++.{s}", .{lib_suffix}), null, need_cpp_includes); - try addCxxKnownPath(b, cfg, exe, b.fmt("libgcc_eh.{s}", .{lib_suffix}), null, need_cpp_includes); - } else { - try addCxxKnownPath(b, cfg, exe, b.fmt("libstdc++.{s}", .{lib_suffix}), null, need_cpp_includes); - } + try addCxxKnownPath(b, cfg, exe, b.fmt("libstdc++.{s}", .{lib_suffix}), null, need_cpp_includes); + if (static) try addCxxKnownPath(b, cfg, exe, b.fmt("libgcc_eh.{s}", .{lib_suffix}), null, need_cpp_includes); }, .solaris, .illumos => { try addCxxKnownPath(b, cfg, exe, b.fmt("libstdc++.{s}", .{lib_suffix}), null, need_cpp_includes); -- 2.54.0