diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-05-17 13:56:17 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-05-17 13:56:17 -0700 |
| commit | 23fd15fd767d93ee5c8404a3b81b20b1a5f79ddb (patch) | |
| tree | 58069e17770f729b869877535bc07eacb053d86f /src/link/Elf.zig | |
| parent | 8405d6f7e2d837e52eaedeb651d596d94297de91 (diff) | |
| download | zig-23fd15fd767d93ee5c8404a3b81b20b1a5f79ddb.tar.gz zig-23fd15fd767d93ee5c8404a3b81b20b1a5f79ddb.zip | |
link/Elf: remove unintended link again libunwind
This was a merge conflict with master branch. The logic for linking
libunwind is already handled above.
Diffstat (limited to 'src/link/Elf.zig')
| -rw-r--r-- | src/link/Elf.zig | 3 |
1 files changed, 0 insertions, 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)); |