fix musl build

vercel · Mar 6, 2024 · a4327c3 · a4327c3
1 parent 60337ff
commit a4327c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 27 deletions.
diff --git a/.github/workflows/lsp.yml b/.github/workflows/lsp.yml
@@ -25,7 +25,7 @@ jobs:
           - host: ubuntu-latest
             target: "aarch64-unknown-linux-musl"
             rust-build-env: 'CC_aarch64_unknown_linux_musl=clang AR_aarch64_unknown_linux_musl=llvm-ar RUSTFLAGS="-Clink-self-contained=yes -Clinker=rust-lld"'
-            setup: "sudo apt-get update && sudo apt-get install -y build-essential musl-tools clang llvm gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu"
+            setup: "sudo apt-get update && sudo apt-get install -y crossbuild-essential-arm64 musl-tools clang llvm"
           - host: windows-latest
             target: x86_64-pc-windows-msvc
           - host: windows-latest
@@ -48,15 +48,6 @@ jobs:
         if: ${{ matrix.settings.setup }}
         run: ${{ matrix.settings.setup }}
 
-      - name: Print Rust toolchain
-        shell: bash
-        run: |
-          rustup show
-          which cargo
-          cargo --version --verbose
-          which rustc
-          rustc --version --verbose
-
       - name: Build
         shell: bash
         run: ${{ matrix.settings.rust-build-env }} cargo build --profile release-turborepo-lsp -p turborepo-lsp --target ${{ matrix.settings.target }}

diff --git a/.github/workflows/turborepo-library-release.yml b/.github/workflows/turborepo-library-release.yml
@@ -38,18 +38,15 @@ jobs:
             target: "x86_64-unknown-linux-musl"
             setup: |
               sudo apt update
-              sudo apt install -y musl-dev
+              sudo apt install -y musl-tools
+
           - host: ubuntu-latest
             target: "aarch64-unknown-linux-musl"
             setup: |
               sudo apt update
-              sudo apt install -y crossbuild-essential-arm64 musl-dev
-
-              echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-              echo "CC_aarch64_unknown_linux_musl=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-              echo "CXX_aarch64_unknown_linux_musl=aarch64-linux-gnu-g++" >> $GITHUB_ENV
-            rust_env: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc RUSTFLAGS="-Ctarget-feature=-crt-static"
-
+              sudo apt install -y crossbuild-essential-arm64 musl-tools clang llvm
+            rust_env: 'CC_aarch64_unknown_linux_musl=clang AR_aarch64_unknown_linux_musl=llvm-ar RUSTFLAGS="-Clink-self-contained=yes -Clinker=rust-lld"
+'
           - host: windows-latest
             target: "aarch64-pc-windows-msvc"
 
@@ -76,15 +73,6 @@ jobs:
         run: ${{ matrix.settings.setup }}
         if: ${{ matrix.settings.setup }}
 
-      - name: Print Rust toolchain
-        shell: bash
-        run: |
-          rustup show
-          which cargo
-          cargo --version --verbose
-          which rustc
-          rustc --version --verbose
-
       - name: Build native library
         shell: bash
         run: |