authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-02-07 19:16:37+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-02-07 19:27:26+01:00
loge3b6d347b29da1862a81463b6f0fa928111532ec
tree5987081235713c606f4b2044a942f9f09094a368
parentf9eb14ddcfdc508fd03f35e9d89a8f55baf7d11b

macho: remove fallback to llvm-ar

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

src/link/MachO.zig-6
...@@ -379,10 +379,6 @@ pub fn deinit(self: *MachO) void {...@@ -379,10 +379,6 @@ pub fn deinit(self: *MachO) void {
379}379}
380380
381pub fn flush(self: *MachO, arena: Allocator, prog_node: *std.Progress.Node) link.File.FlushError!void {381pub fn flush(self: *MachO, arena: Allocator, prog_node: *std.Progress.Node) link.File.FlushError!void {
382 // TODO: I think this is just a temp and can be removed once we can emit static archives
383 if (self.base.isStaticLib() and build_options.have_llvm and self.base.comp.config.use_llvm) {
384 return self.base.linkAsArchive(arena, prog_node);
385 }
386 try self.flushModule(arena, prog_node);382 try self.flushModule(arena, prog_node);
387}383}
388384
...@@ -395,8 +391,6 @@ pub fn flushModule(self: *MachO, arena: Allocator, prog_node: *std.Progress.Node...@@ -395,8 +391,6 @@ pub fn flushModule(self: *MachO, arena: Allocator, prog_node: *std.Progress.Node
395391
396 if (self.llvm_object) |llvm_object| {392 if (self.llvm_object) |llvm_object| {
397 try self.base.emitLlvmObject(arena, llvm_object, prog_node);393 try self.base.emitLlvmObject(arena, llvm_object, prog_node);
398 // TODO: I think this is just a temp and can be removed once we can emit static archives
399 if (self.base.isStaticLib() and build_options.have_llvm and self.base.comp.config.use_llvm) return;
400 }394 }
401395
402 var sub_prog_node = prog_node.start("MachO Flush", 0);396 var sub_prog_node = prog_node.start("MachO Flush", 0);