greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use musl libc for ARM binaries (#1037)

Browse Source
This commit is contained in:
Casey Rodarmor 2021-11-27 01:01:41 -08:00 committed by GitHub
parent daef7caaed
commit a4bd1cb67c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/release.yaml vendored
View File

@ -16,17 +16,17 @@ jobs:
strategy: strategy:
matrix: matrix:
target: target:
- aarch64-unknown-linux-gnu - aarch64-unknown-linux-musl
- armv7-unknown-linux-gnueabihf - armv7-unknown-linux-musleabihf
- x86_64-apple-darwin - x86_64-apple-darwin
- x86_64-pc-windows-msvc - x86_64-pc-windows-msvc
- x86_64-unknown-linux-musl - x86_64-unknown-linux-musl
include: include:
- target: aarch64-unknown-linux-gnu - target: aarch64-unknown-linux-musl
os: ubuntu-latest os: ubuntu-latest
native: false native: false
target_rustflags: '--codegen linker=aarch64-linux-gnu-gcc' target_rustflags: '--codegen linker=aarch64-linux-gnu-gcc'
- target: armv7-unknown-linux-gnueabihf - target: armv7-unknown-linux-musleabihf
os: ubuntu-latest os: ubuntu-latest
native: false native: false
target_rustflags: '--codegen linker=arm-linux-gnueabihf-gcc' target_rustflags: '--codegen linker=arm-linux-gnueabihf-gcc'
@ -56,13 +56,13 @@ jobs:
toolchain: stable toolchain: stable
- name: Install AArch64 Toolchain - name: Install AArch64 Toolchain
if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }} if: ${{ matrix.target == 'aarch64-unknown-linux-musl' }}
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install gcc-aarch64-linux-gnu sudo apt-get install gcc-aarch64-linux-gnu
- name: Install ARM7 Toolchain - name: Install ARM7 Toolchain
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }} if: ${{ matrix.target == 'armv7-unknown-linux-musleabihf' }}
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install gcc-arm-linux-gnueabihf sudo apt-get install gcc-arm-linux-gnueabihf

2
docs/install.sh
View File

@ -106,7 +106,7 @@ if [ -z ${target-} ]; then
uname_target=`uname -m`-`uname -s` uname_target=`uname -m`-`uname -s`
case $uname_target in case $uname_target in
aarch64-Linux) target=aarch64-unknown-linux-gnu;; aarch64-Linux) target=aarch64-unknown-linux-musl;;
x86_64-Darwin) target=x86_64-apple-darwin;; x86_64-Darwin) target=x86_64-apple-darwin;;
x86_64-Linux) target=x86_64-unknown-linux-musl;; x86_64-Linux) target=x86_64-unknown-linux-musl;;
x86_64-Windows_NT) target=x86_64-pc-windows-msvc;; x86_64-Windows_NT) target=x86_64-pc-windows-msvc;;