Commit f1feb1369b128fb515a369b1144574b4c1b53b6e | zig

author	Cody Tapscott <topolarity@tapscott.me> 2022-07-11 18:47:54-07:00
committer	Cody Tapscott <topolarity@tapscott.me> 2022-07-28 22:21:24-07:00
log	f1feb1369b128fb515a369b1144574b4c1b53b6e
tree	3c2cd656163ef72cae6a296d1b8ec47f6d4b0857
parent	b0525344a2b0b158369251c031159bef241048da

Dynamically link libc++, if integrating with system LLVM

This ensures that the zigcpp clang driver and LLVM are using the
same copy of libc++. See prior commit for more details.

1 files changed, 10 insertions(+), 6 deletions(-)

build.zig

build.zig+10-6

 @@ -565,13 +565,17 @@ fn addCmakeCfgOptionsToExe(
         exe.linkLibCpp();
     } else {
         const need_cpp_includes = true;
+        const lib_suffix = switch (cfg.llvm_linkage) {
+            .static => exe.target.staticLibSuffix()[1..],
+            .dynamic => exe.target.dynamicLibSuffix()[1..],
+        };
         // System -lc++ must be used because in this code path we are attempting to link
         // against system-provided LLVM, Clang, LLD.
         if (exe.target.getOsTag() == .linux) {
-            // First we try to static link against gcc libstdc++. If that doesn't work,
+            // First we try to link against gcc libstdc++. If that doesn't work, we fall
-            // we fall back to -lc++ and cross our fingers.
+            // back to -lc++ and cross our fingers.
-            addCxxKnownPath(b, cfg, exe, "libstdc++.a", "", need_cpp_includes) catch |err| switch (err) {
+            addCxxKnownPath(b, cfg, exe, b.fmt("libstdc++.{s}", .{lib_suffix}), "", need_cpp_includes) catch |err| switch (err) {
                 error.RequiredLibraryNotFound => {
                     exe.linkSystemLibrary("c++");
                 },
 @@ -579,11 +583,11 @@ fn addCmakeCfgOptionsToExe(
             };
             exe.linkSystemLibrary("unwind");
         } else if (exe.target.isFreeBSD()) {
-            try addCxxKnownPath(b, cfg, exe, "libc++.a", null, need_cpp_includes);
+            try addCxxKnownPath(b, cfg, exe, b.fmt("libc++.{s}", .{lib_suffix}), null, need_cpp_includes);
             exe.linkSystemLibrary("pthread");
         } else if (exe.target.getOsTag() == .openbsd) {
-            try addCxxKnownPath(b, cfg, exe, "libc++.a", null, need_cpp_includes);
+            try addCxxKnownPath(b, cfg, exe, b.fmt("libc++.{s}", .{lib_suffix}), null, need_cpp_includes);
-            try addCxxKnownPath(b, cfg, exe, "libc++abi.a", null, need_cpp_includes);
+            try addCxxKnownPath(b, cfg, exe, b.fmt("libc++abi.{s}", .{lib_suffix}), null, need_cpp_includes);
         } else if (exe.target.isDarwin()) {
             exe.linkSystemLibrary("c++");
         }