Skip to content

Commit 0e8f0ce

Browse files
committed
combine old arm musl setup
1 parent 66254e1 commit 0e8f0ce

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,6 @@ jobs:
147147
echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
148148
echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
149149
150-
- name: Linux ARM setup
151-
if: matrix.target == 'aarch64-unknown-linux-musl'
152-
run: |
153-
sudo apt-get update -y
154-
sudo apt-get install -y gcc-aarch64-linux-gnu
155-
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
156-
157150
- name: Musl setup (x86_64)
158151
if: matrix.target == 'x86_64-unknown-linux-musl'
159152
run: |
@@ -169,13 +162,14 @@ jobs:
169162
if: matrix.target == 'aarch64-unknown-linux-musl'
170163
run: |
171164
sudo apt-get update -y
172-
sudo apt-get install -y clang musl-tools musl-dev
165+
sudo apt-get install -y clang musl-tools musl-dev gcc-aarch64-linux-gnu
173166
174167
# g++ supports musl
175168
sudo ln -s /usr/bin/g++ /usr/bin/musl-g++
176169
177170
# cc-rs uses the wrong defaults for this target so we override them.
178171
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
172+
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
179173
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
180174
181175
rustup target add ${{ matrix.target }}

0 commit comments

Comments
 (0)