Skip to content

Commit a5f0458

Browse files
committed
1. Add cross build from aarch64 to x86_64 linux
2. Add ubuntu-24.04-arm build host
1 parent a653a02 commit a5f0458

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test:
1111
strategy:
1212
matrix:
13-
os: [ubuntu-latest, macos-latest, windows-latest]
13+
os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm]
1414

1515
runs-on: ${{matrix.os}}
1616

@@ -29,7 +29,7 @@ jobs:
2929
test_cross:
3030
strategy:
3131
matrix:
32-
os: [ubuntu-latest, macos-latest, windows-latest]
32+
os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm]
3333

3434
runs-on: ${{matrix.os}}
3535

build/luajit.zig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ pub fn configure(b: *Build, target: Build.ResolvedTarget, optimize: std.builtin.
127127

128128
const buildvm_c_flags: []const []const u8 = switch (target.result.cpu.arch) {
129129
.aarch64, .aarch64_be => &.{ "-DLUAJIT_TARGET=LUAJIT_ARCH_arm64", "-DLJ_ARCH_HASFPU=1", "-DLJ_ABI_SOFTFP=0" },
130+
.x86_64 => &.{ "-DLUAJIT_TARGET=LUAJIT_ARCH_X64" },
130131
else => &.{},
131132
};
132133

makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ test_cross:
1919
zig build -Dlang=luajit -Dtarget=aarch64-linux
2020
zig build -Dlang=luajit -Dtarget=aarch64-linux-gnu
2121

22+
zig build -Dlang=lua51 -Dtarget=x86_64-linux
23+
zig build -Dlang=lua51 -Dtarget=x86_64-linux-gnu
24+
zig build -Dlang=luajit -Dtarget=x86_64-linux
25+
zig build -Dlang=luajit -Dtarget=x86_64-linux-gnu
26+
2227
zig build -Dlang=luajit -Dtarget=aarch64-macos
2328

2429
docs:

0 commit comments

Comments
 (0)