From a4bd1cb67cea252f9d77ad9c8ad9f0ddfb6e0926 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Sat, 27 Nov 2021 01:01:41 -0800 Subject: [PATCH] Use musl libc for ARM binaries (#1037) --- .github/workflows/release.yaml | 12 ++++++------ docs/install.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7b08d26c25..6dad55e1c2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,17 +16,17 @@ jobs: strategy: matrix: target: - - aarch64-unknown-linux-gnu - - armv7-unknown-linux-gnueabihf + - aarch64-unknown-linux-musl + - armv7-unknown-linux-musleabihf - x86_64-apple-darwin - x86_64-pc-windows-msvc - x86_64-unknown-linux-musl include: - - target: aarch64-unknown-linux-gnu + - target: aarch64-unknown-linux-musl os: ubuntu-latest native: false target_rustflags: '--codegen linker=aarch64-linux-gnu-gcc' - - target: armv7-unknown-linux-gnueabihf + - target: armv7-unknown-linux-musleabihf os: ubuntu-latest native: false target_rustflags: '--codegen linker=arm-linux-gnueabihf-gcc' @@ -56,13 +56,13 @@ jobs: toolchain: stable - name: Install AArch64 Toolchain - if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }} + if: ${{ matrix.target == 'aarch64-unknown-linux-musl' }} run: | sudo apt-get update sudo apt-get install gcc-aarch64-linux-gnu - name: Install ARM7 Toolchain - if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }} + if: ${{ matrix.target == 'armv7-unknown-linux-musleabihf' }} run: | sudo apt-get update sudo apt-get install gcc-arm-linux-gnueabihf diff --git a/docs/install.sh b/docs/install.sh index 416ba5e6bf..09059a1e24 100755 --- a/docs/install.sh +++ b/docs/install.sh @@ -106,7 +106,7 @@ if [ -z ${target-} ]; then uname_target=`uname -m`-`uname -s` 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-Linux) target=x86_64-unknown-linux-musl;; x86_64-Windows_NT) target=x86_64-pc-windows-msvc;;