Skip to content

Commit d0580c6

Browse files
committed
try fix aarch64
1 parent 9048ea5 commit d0580c6

File tree

3 files changed

+31
-17
lines changed

3 files changed

+31
-17
lines changed

.github/workflows/build.yml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
include:
19-
- { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu, platform: linux-x64, cross: false }
20-
- { os: ubuntu-20.04, target: aarch64-unknown-linux-gnu, platform: linux-arm64, cross: true }
21-
- { os: ubuntu-20.04, target: x86_64-unknown-linux-musl, platform: linux-musl, cross: true }
22-
- { os: ubuntu-20.04, target: x86_64-unknown-freebsd, platform: linux-bsd, cross: true }
23-
- { os: macos-latest, target: x86_64-apple-darwin, platform: darwin-x64, cross: false }
24-
- { os: macos-latest, target: aarch64-apple-darwin, platform: darwin-arm64, cross: false }
25-
- { os: windows-latest, target: x86_64-pc-windows-msvc, platform: win32-x64, cross: false }
26-
- { os: windows-latest, target: i686-pc-windows-msvc, platform: win32-ia32, cross: false }
19+
- { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu, platform: linux-x64, cross: general }
20+
- { os: ubuntu-20.04, target: aarch64-unknown-linux-gnu, platform: linux-arm64, cross: aarch64 }
21+
- { os: ubuntu-20.04, target: x86_64-unknown-linux-musl, platform: linux-musl, cross: musl }
22+
- { os: ubuntu-20.04, target: x86_64-unknown-freebsd, platform: linux-bsd, cross: bsd }
23+
- { os: macos-latest, target: x86_64-apple-darwin, platform: darwin-x64, cross: general }
24+
- { os: macos-latest, target: aarch64-apple-darwin, platform: darwin-arm64, cross: general }
25+
- { os: windows-latest, target: x86_64-pc-windows-msvc, platform: win32-x64, cross: general }
26+
- { os: windows-latest, target: i686-pc-windows-msvc, platform: win32-ia32, cross: general }
2727
runs-on: ${{ matrix.os }}
2828
steps:
2929
- uses: actions/checkout@v4
@@ -32,14 +32,23 @@ jobs:
3232
- name: Install Rust toolchain
3333
uses: dtolnay/rust-toolchain@stable
3434
- name: Build - General
35-
if: ${{ matrix.cross == false }}
35+
if: ${{ matrix.cross == general }}
3636
run: |
3737
rustup target add ${{ matrix.target }}
3838
cargo build --release --target ${{ matrix.target }} --target-dir target/${{ matrix.platform }}
39-
- name: Build - cross
40-
if: ${{ matrix.cross == true }}
39+
- name: Build - musl
40+
if: ${{ matrix.cross == musl }}
4141
run: |
4242
cargo install cross
4343
cross build --release --target ${{ matrix.target }} --target-dir target/${{ matrix.platform }}
44+
- name: Build - aarch64
45+
if: ${{ matrix.cross == aarch64 }}
46+
env:
47+
CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc
48+
CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++
49+
run: |
50+
apt-get update
51+
apt-get install -y gcc-aarch64-linux-gnu libc6-dev-arm64-cross g++-aarch64-linux-gnu
52+
cargo build --release --target ${{ matrix.target }} --target-dir target/${{ matrix.platform }}
4453
4554

Cross.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
[target.aarch64-unknown-linux-gnu]
2-
image = "rustembedded/cross:aarch64-unknown-linux-gnu-0.2.1"
3-
4-
[target.aarch64-unknown-linux-gnu.env]
5-
CXXFLAGS = "-std=c++17"
6-

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
This project is currently a work in progress. It is an exploration of using Rust as a host.
44

5+
# Build Support
6+
7+
[x] win32-x64
8+
[x] win32-ia32
9+
[ ] linux-arm64
10+
[x] linux-x64
11+
[x] linux-musl
12+
[ ] linux-bsd
13+
[x] darwin-x64
14+
[x] darwin-arm64
15+
516
# Build
617

718
Rust version: 1.81.0

0 commit comments

Comments
 (0)