compiler: Link libunwind when linking glibc statically.

glibc's libc.a depends on the functions provided by libunwind.

1 files changed, 9 insertions, 1 deletions

diff --git a/src/Compilation/Config.zig b/src/Compilation/Config.zig
index 1de0d83aa7..71df1d9311 100644
--- a/src/Compilation/Config.zig
+++ b/src/Compilation/Config.zig
@@ -129,6 +129,7 @@ pub const ResolveError = error{
     LldCannotIncrementallyLink,
     LtoRequiresLld,
     SanitizeThreadRequiresLibCpp,
+    LibCRequiresLibUnwind,
     LibCppRequiresLibUnwind,
     OsRequiresLibC,
     LibCppRequiresLibC,
@@ -312,7 +313,7 @@ pub fn resolve(options: Options) ResolveError!Config {
         break :b false;
     };
 
-    const link_libunwind = b: {
+    var link_libunwind = b: {
         if (link_libcpp and target_util.libCxxNeedsLibUnwind(target)) {
             if (options.link_libunwind == false) return error.LibCppRequiresLibUnwind;
             break :b true;
@@ -379,6 +380,13 @@ pub fn resolve(options: Options) ResolveError!Config {
         break :b .static;
     };
 
+    // This is done here to avoid excessive duplicated logic due to the complex dependencies between these options.
+    if (options.output_mode == .Exe and link_libc and target_util.libCNeedsLibUnwind(target, link_mode)) {
+        if (options.link_libunwind == false) return error.LibCRequiresLibUnwind;
+
+        link_libunwind = true;
+    }
+
     const import_memory = options.import_memory orelse (options.output_mode == .Obj);
     const export_memory = b: {
         if (link_mode == .dynamic) {