From 8069df2661509f0b0bdf89b293385ea5b4cef7ec Mon Sep 17 00:00:00 2001 From: bfredl Date: Tue, 6 Jan 2026 10:46:42 +0100 Subject: [PATCH] fix(build): build.zig: use luajit for windows These were disabled as they failed when tested with cross-compiling, but it works fine for windows natively on ci, so let's use that. mac os builds after disabling debug info, which currently triggers a bug in zig's MachO linker: natecraddock/ziglua#191 Tracking issue: https://codeberg.org/ziglang/zig/issues/30669 Unfortunately actually using the JIT of luajit still triggers issues on mac os, so we cannot use it yet. Also sync luajit version used via ziglua to a recent one like we use in cmake, see natecraddock/ziglua#196 --- build.zig | 4 +--- build.zig.zon | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.zig b/build.zig index 4c2bddb31e..68115ed032 100644 --- a/build.zig +++ b/build.zig @@ -61,9 +61,7 @@ pub fn build(b: *std.Build) !void { // puc lua 5.1 is not ReleaseSafe "safe" const optimize_lua = if (optimize == .Debug or optimize == .ReleaseSafe) .ReleaseSmall else optimize; - const arch = t.cpu.arch; - const default_luajit = (is_linux and arch == .x86_64) or (is_darwin and arch == .aarch64); - const use_luajit = b.option(bool, "luajit", "use luajit") orelse default_luajit; + const use_luajit = b.option(bool, "luajit", "use luajit") orelse true; const lualib_name = if (use_luajit) "luajit" else "lua5.1"; const host_use_luajit = if (cross_compiling) false else use_luajit; const E = enum { luajit, lua51 }; diff --git a/build.zig.zon b/build.zig.zon index b76bbbce66..7daf0b199f 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -6,8 +6,8 @@ .dependencies = .{ .zlua = .{ - .url = "git+https://github.com/natecraddock/ziglua#dca1800ea46f5a19fc9abf88b2f8c1617f86ac23", - .hash = "zlua-0.1.0-hGRpC1dCBQDf-IqqUifYvyr8B9-4FlYXqY8cl7HIetrC", + .url = "git+https://github.com/natecraddock/ziglua#a1cae53f6b841dd4fa108103f4bd0f515ca29cfb", + .hash = "zlua-0.1.0-hGRpCwxDBQD25I09a5dhcaNCEontuUsq2pgB34wjugHQ", }, .lpeg = .{ .url = "https://github.com/neovim/deps/raw/d495ee6f79e7962a53ad79670cb92488abe0b9b4/opt/lpeg-1.1.0.tar.gz",