Skip to content

Commit 75a9354

Browse files
committed
fix(build): zig macos linker is not happy with luajit debug info
same as 61f8ca4 but ported to the v0.15.2 branch On master attempting to build -Dlang=luajit on macos (at least for arm64) hits an assert in Zig's MachO linker: thread 73187 panic: unexpected pointer encoding /home/bfredl/dev/zig/src/link/MachO/eh_frame.zig:33:21: 0x772f808 in parse (main.zig) @Panic("unexpected pointer encoding"); // TODO error ^ /home/bfredl/dev/zig/src/link/MachO/Object.zig:1125:22: 0x7732c1d in initEhFrameRecords (main.zig) try cie.parse(macho_file); ^ /home/bfredl/dev/zig/src/link/MachO/Object.zig:255:36: 0x7743887 in parse (main.zig) try self.initEhFrameRecords(gpa, index, handle, macho_file); ^ /home/bfredl/dev/zig/src/link/MachO/file.zig:336:35: 0x7745bd3 in parse (main.zig) .object => |x| x.parse(macho_file), ^ with some debugging this turns out to be the __eh_frame section which is generated in lj_vm.S. This debug info can be disabled at compile time using LJ_NO_UNWIND. Ideally this should be handled better upstream by omiting debug frames it does not understand instead of crashing the compiler, but for now this allows luajit to be used on macos at all.
1 parent dca1800 commit 75a9354

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

build/luajit.zig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,11 @@ pub fn configure(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin.
131131
else => &.{},
132132
};
133133

134-
const buildvm_windows_c_flags: []const []const u8 = if (target.result.os.tag == .windows)
134+
const buildvm_os_c_flags: []const []const u8 = if (target.result.os.tag == .windows)
135135
&.{"-DLUAJIT_OS=1"}
136+
else if (target.result.os.tag.isDarwin())
137+
// FIXME: this can be removed once https://codeberg.org/ziglang/zig/issues/30669 is successfully resolved
138+
&.{"-DLJ_NO_UNWIND=1"}
136139
else
137140
&.{};
138141

@@ -142,7 +145,7 @@ pub fn configure(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin.
142145
.sub_path = "",
143146
} },
144147
.files = &.{ "src/host/buildvm_asm.c", "src/host/buildvm_fold.c", "src/host/buildvm_lib.c", "src/host/buildvm_peobj.c", "src/host/buildvm.c" },
145-
.flags = std.mem.concat(b.allocator, []const u8, &.{ buildvm_c_flags, buildvm_windows_c_flags }) catch @panic("OOM!"),
148+
.flags = std.mem.concat(b.allocator, []const u8, &.{ buildvm_c_flags, buildvm_os_c_flags }) catch @panic("OOM!"),
146149
});
147150

148151
buildvm.addIncludePath(upstream.path("src"));

0 commit comments

Comments
 (0)