Use 'tools' term instead of linker, add musl-tools for x64 linux MUSL

This commit is contained in:
2024-10-03 18:35:41 -05:00
parent bafdd942e6
commit 7b9532fda7

View File

@@ -37,12 +37,13 @@ jobs:
include: include:
- os: ubuntu-latest - os: ubuntu-latest
target: x86_64-unknown-linux-musl target: x86_64-unknown-linux-musl
tools: musl-tools
- os: ubuntu-latest - os: ubuntu-latest
target: aarch64-unknown-linux-musl target: aarch64-unknown-linux-musl
linker: gcc-aarch64-linux-gnu tools: gcc-aarch64-linux-gnu
- os: ubuntu-latest - os: ubuntu-latest
target: armv7-unknown-linux-gnueabihf target: armv7-unknown-linux-gnueabihf
linker: gcc-arm-linux-gnueabihf tools: gcc-arm-linux-gnueabihf
- os: macos-latest - os: macos-latest
target: x86_64-apple-darwin target: x86_64-apple-darwin
- os: macos-latest - os: macos-latest
@@ -63,11 +64,11 @@ jobs:
targets: ${{ matrix.target }} targets: ${{ matrix.target }}
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
- name: Install Linker - name: Install Linker Tools
if: matrix.linker if: matrix.tools
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install ${{ matrix.linker }} sudo apt-get install ${{ matrix.tools }}
# ensure has a newline at the end # ensure has a newline at the end
[ "$(tail -c 1 .cargo/config.toml)" != "" ] && echo >> .cargo/config.toml [ "$(tail -c 1 .cargo/config.toml)" != "" ] && echo >> .cargo/config.toml
cat .cargo/config.github.toml >> .cargo/config.toml cat .cargo/config.github.toml >> .cargo/config.toml