From 23fd15fd767d93ee5c8404a3b81b20b1a5f79ddb Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 17 May 2021 13:56:17 -0700
Subject: [PATCH] link/Elf: remove unintended link again libunwind

This was a merge conflict with master branch. The logic for linking
libunwind is already handled above.
---
 src/link/Elf.zig | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/link/Elf.zig b/src/link/Elf.zig
index 0ebbe819d4..c998cb0b75 100644
--- a/src/link/Elf.zig
+++ b/src/link/Elf.zig
@@ -1653,9 +1653,6 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
             // libc dep
             if (self.base.options.link_libc) {
                 if (self.base.options.libc_installation != null) {
-                    if (target_util.libcNeedsLibUnwind(target)) {
-                        try argv.append(comp.libunwind_static_lib.?.full_object_path);
-                    }
                     const needs_grouping = self.base.options.link_mode == .Static;
                     if (needs_grouping) try argv.append("--start-group");
                     try argv.appendSlice(target_util.libcFullLinkFlags(target));