Switch to cargo-zigbuild for aarch64-unknown-linux-gnu and x86_64-unknown-linux-musl (#814)

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-02-17 07:36:45 +11:00 committed by GitHub
parent 69a1c26951
commit 61c992612c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 12 deletions

View file

@ -19,16 +19,16 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- { o: macos-latest, t: x86_64-apple-darwin, r: true } - { o: macos-latest, t: x86_64-apple-darwin, r: true }
- { o: macos-latest, t: aarch64-apple-darwin } - { o: macos-latest, t: aarch64-apple-darwin }
- { o: ubuntu-20.04, t: x86_64-unknown-linux-gnu, r: true } - { o: ubuntu-20.04, t: x86_64-unknown-linux-gnu, r: true }
- { o: ubuntu-20.04, t: armv7-unknown-linux-gnueabihf, c: true } - { o: ubuntu-20.04, t: armv7-unknown-linux-gnueabihf, c: true }
- { o: ubuntu-20.04, t: aarch64-unknown-linux-gnu } - { o: ubuntu-20.04, t: aarch64-unknown-linux-gnu, c: true }
- { o: ubuntu-latest, t: x86_64-unknown-linux-musl, r: true } - { o: ubuntu-latest, t: x86_64-unknown-linux-musl, r: true, c: true }
- { o: ubuntu-latest, t: armv7-unknown-linux-musleabihf, c: true } - { o: ubuntu-latest, t: armv7-unknown-linux-musleabihf, c: true }
- { o: ubuntu-latest, t: aarch64-unknown-linux-musl, c: true } - { o: ubuntu-latest, t: aarch64-unknown-linux-musl, c: true }
- { o: windows-latest, t: x86_64-pc-windows-msvc, r: true } - { o: windows-latest, t: x86_64-pc-windows-msvc, r: true }
- { o: windows-latest, t: aarch64-pc-windows-msvc } - { o: windows-latest, t: aarch64-pc-windows-msvc }
name: ${{ matrix.t }} name: ${{ matrix.t }}
runs-on: ${{ matrix.o }} runs-on: ${{ matrix.o }}

View file

@ -105,8 +105,6 @@ export RUSTFLAGS := "-Z share-generics " + (rustc-gcclibs) + (rustc-miropt) + (r
# libblocksruntime-dev provides compiler-rt # libblocksruntime-dev provides compiler-rt
ci-apt-deps := if target == "x86_64-unknown-linux-gnu" { "liblzma-dev libzip-dev libzstd-dev" ci-apt-deps := if target == "x86_64-unknown-linux-gnu" { "liblzma-dev libzip-dev libzstd-dev"
} else if target == "x86_64-unknown-linux-musl" { "musl-tools"
} else if target == "aarch64-unknown-linux-gnu" { "g++-aarch64-linux-gnu libc6-dev-arm64-cross binutils binutils-aarch64-linux-gnu libblocksruntime-dev"
} else { "" } } else { "" }
[linux] [linux]