From fcdb7027e9f606cf0f4415daee73cb717affe69e Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Sun, 7 Apr 2024 21:19:12 -0400 Subject: haiku: fix linking issues --- src/link/Elf.zig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/link') diff --git a/src/link/Elf.zig b/src/link/Elf.zig index c20a4b6afa..72937cd628 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1517,7 +1517,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void { if (self.base.isStatic()) { try argv.append("-static"); - } else if (self.base.isDynLib()) { + } else if (self.base.isDynLib() or (target.os.tag == .haiku and self.base.isExe())) { try argv.append("-shared"); } @@ -2469,7 +2469,10 @@ fn linkWithLLD(self: *Elf, arena: Allocator, prog_node: *std.Progress.Node) !voi } else { try argv.append("-static"); } - } else if (is_dyn_lib) { + } else if (switch (target.os.tag) { + else => is_dyn_lib, + .haiku => is_exe_or_dyn_lib, + }) { try argv.append("-shared"); } -- cgit v1.2.3