authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-05-17 13:56:17-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-05-17 13:56:17-07:00
log23fd15fd767d93ee5c8404a3b81b20b1a5f79ddb
tree58069e17770f729b869877535bc07eacb053d86f
parent8405d6f7e2d837e52eaedeb651d596d94297de91

link/Elf: remove unintended link again libunwind

This was a merge conflict with master branch. The logic for linking libunwind is already handled above.

1 files changed, 0 insertions(+), 3 deletions(-)

src/link/Elf.zig-3
...@@ -1653,9 +1653,6 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {...@@ -1653,9 +1653,6 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
1653 // libc dep1653 // libc dep
1654 if (self.base.options.link_libc) {1654 if (self.base.options.link_libc) {
1655 if (self.base.options.libc_installation != null) {1655 if (self.base.options.libc_installation != null) {
1656 if (target_util.libcNeedsLibUnwind(target)) {
1657 try argv.append(comp.libunwind_static_lib.?.full_object_path);
1658 }
1659 const needs_grouping = self.base.options.link_mode == .Static;1656 const needs_grouping = self.base.options.link_mode == .Static;
1660 if (needs_grouping) try argv.append("--start-group");1657 if (needs_grouping) try argv.append("--start-group");
1661 try argv.appendSlice(target_util.libcFullLinkFlags(target));1658 try argv.appendSlice(target_util.libcFullLinkFlags(target));