Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build break for zig 0.14.0-dev.2596 #131

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix build break for zig 0.14.0-dev.2596 #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/configure-pages@v2
- uses: mlugg/setup-zig@v1
with:
version: 0.14.0-dev.1820+ea527f7a8
version: 0.14.0-dev.2596+e6879e99e
- run: make docs
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Zig
uses: mlugg/setup-zig@v1
with:
version: 0.14.0-dev.1820+ea527f7a8
version: 0.14.0-dev.2596+e6879e99e

- name: Run tests
run: make test
6 changes: 4 additions & 2 deletions build/luajit.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ pub fn configure(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin.
.name = "lua",
.target = target,
.optimize = optimize,
.unwind_tables = .sync,
})
else
b.addStaticLibrary(.{
.name = "lua",
.target = target,
.optimize = optimize,
.unwind_tables = .sync,
});

// Compile minilua interpreter used at build time to generate files
Expand Down Expand Up @@ -163,9 +165,9 @@ pub fn configure(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin.

lib.linkLibC();

lib.defineCMacro("LUAJIT_UNWIND_EXTERNAL", null);
lib.root_module.addCMacro("LUAJIT_UNWIND_EXTERNAL", "");

lib.linkSystemLibrary("unwind");
lib.root_module.unwind_tables = true;

lib.addIncludePath(upstream.path("src"));
lib.addIncludePath(luajit_h.dirname());
Expand Down
Loading