combine old arm musl setup

succinctlabs · Jan 15, 2025 · 0e8f0ce · 0e8f0ce
1 parent 66254e1
commit 0e8f0ce
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -147,13 +147,6 @@ jobs:
           echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
           echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV
 
-      - name: Linux ARM setup
-        if: matrix.target == 'aarch64-unknown-linux-musl'
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y gcc-aarch64-linux-gnu
-          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-
       - name: Musl setup (x86_64)
         if: matrix.target == 'x86_64-unknown-linux-musl'
         run: |
@@ -169,13 +162,14 @@ jobs:
         if: matrix.target == 'aarch64-unknown-linux-musl'
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y clang musl-tools musl-dev
+          sudo apt-get install -y clang musl-tools musl-dev gcc-aarch64-linux-gnu
 
           # g++ supports musl
           sudo ln -s /usr/bin/g++ /usr/bin/musl-g++
 
           # cc-rs uses the wrong defaults for this target so we override them.
           echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
+          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
           echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
           
           rustup target add ${{ matrix.target }}