Skip to content

Commit c8005ba

Browse files
committed
Support aarch64-apple-darwin && update mips64
1 parent b0b14b8 commit c8005ba

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,22 @@ jobs:
1010
target:
1111
- x86_64-unknown-linux-gnu
1212
- aarch64-unknown-linux-gnu
13-
- mips64el-unknown-linux-gnuabi64
13+
- mips64-unknown-linux-gnuabi64
1414
- x86_64-apple-darwin
15+
- aarch64-apple-darwin
1516
- x86_64-pc-windows-msvc
1617
rust: [stable]
1718
include:
1819
- target: x86_64-unknown-linux-gnu
1920
os: ubuntu-18.04
2021
- target: aarch64-unknown-linux-gnu
2122
os: ubuntu-18.04
22-
- target: mips64el-unknown-linux-gnuabi64
23+
- target: mips64-unknown-linux-gnuabi64
2324
os: ubuntu-18.04
2425
- target: x86_64-apple-darwin
2526
os: macos-latest
27+
- target: aarch64-apple-darwin
28+
os: macos-11.0
2629
- target: x86_64-pc-windows-msvc
2730
os: windows-latest
2831
steps:
@@ -40,11 +43,11 @@ jobs:
4043
sudo apt-get update -y
4144
sudo apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu libc6-dev-arm64-cross
4245
shell: bash
43-
- name: Install GCC (mips64el-unknown-linux-gnuabi64)
44-
if: ${{ matrix.target == 'mips64el-unknown-linux-gnuabi64' }}
46+
- name: Install GCC (mips64-unknown-linux-gnuabi64)
47+
if: ${{ matrix.target == 'mips64-unknown-linux-gnuabi64' }}
4548
run: |
4649
sudo apt-get update -y
47-
sudo apt-get install -y --no-install-recommends gcc-mips64el-linux-gnuabi64 libc6-dev-mips64el-cross
50+
sudo apt-get install -y --no-install-recommends gcc-mips64-linux-gnuabi64 libc6-dev-mips64-cross
4851
shell: bash
4952
- name: Build ${{ matrix.lua }}
5053
run: |

src/lib.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,15 @@ impl Build {
8686
make.current_dir(build_dir.join("src"));
8787
make.arg("-e");
8888

89-
if target == "x86_64-apple-darwin" {
90-
// 10.15 causes segmentation fault on github ci
91-
make.env("MACOSX_DEPLOYMENT_TARGET", "10.11");
92-
make.env("XCFLAGS", "-DLUAJIT_ENABLE_GC64");
89+
match target {
90+
"x86_64-apple-darwin" => {
91+
// 10.15 causes segmentation fault on github ci
92+
make.env("MACOSX_DEPLOYMENT_TARGET", "10.11");
93+
}
94+
"aarch64-apple-darwin" => {
95+
make.env("MACOSX_DEPLOYMENT_TARGET", "11.0");
96+
}
97+
_ => {}
9398
}
9499

95100
// Infer ar/ranlib tools from cross compilers if the it looks like

0 commit comments

Comments
 (0)