set correct x-compile lib gcc-aarch64-linux-gnu for arm64 builds.

This commit is contained in:
jasonwitty 2025-11-22 12:28:34 -08:00
parent dd1dbdf29b
commit cc167f71d3

View File

@ -46,25 +46,32 @@ jobs:
- name: Install build dependencies - name: Install build dependencies
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y libdrm-dev libdrm-amdgpu1 sudo apt-get install -y dpkg-dev
- name: Install cross-compilation tools (ARM64) - name: Install cross-compilation tools (ARM64)
if: matrix.target == 'aarch64-unknown-linux-gnu' if: matrix.target == 'aarch64-unknown-linux-gnu'
run: | run: |
sudo dpkg --add-architecture arm64
sudo apt-get update sudo apt-get update
sudo apt-get install -y libdrm-dev libdrm-amdgpu1 gcc-aarch64-linux-gnu sudo apt-get install -y gcc-aarch64-linux-gnu libdrm-dev:arm64 libdrm-amdgpu1:arm64
- name: Install cross-compilation tools (ARMhf) - name: Install cross-compilation tools (ARMhf)
if: matrix.target == 'armv7-unknown-linux-gnueabihf' if: matrix.target == 'armv7-unknown-linux-gnueabihf'
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y libdrm-dev libdrm-amdgpu1 gcc-arm-linux-gnueabihf sudo apt-get install -y gcc-arm-linux-gnueabihf
- name: Install cross-compilation tools (RISC-V) - name: Install cross-compilation tools (RISC-V)
if: matrix.target == 'riscv64gc-unknown-linux-gnu' if: matrix.target == 'riscv64gc-unknown-linux-gnu'
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y libdrm-dev libdrm-amdgpu1 gcc-riscv64-linux-gnu sudo apt-get install -y gcc-riscv64-linux-gnu
- name: Install GPU libraries (x86_64)
if: matrix.target == 'x86_64-unknown-linux-gnu'
run: |
sudo apt-get update
sudo apt-get install -y libdrm-dev libdrm-amdgpu1
- name: Configure cross-compilation (ARM64) - name: Configure cross-compilation (ARM64)
if: matrix.target == 'aarch64-unknown-linux-gnu' if: matrix.target == 'aarch64-unknown-linux-gnu'
@ -116,12 +123,12 @@ jobs:
cargo deb --package socktop --target ${{ matrix.target }} --no-strip cargo deb --package socktop --target ${{ matrix.target }} --no-strip
- name: Build socktop_agent .deb package (with GPU support) - name: Build socktop_agent .deb package (with GPU support)
if: matrix.target != 'riscv64gc-unknown-linux-gnu' && matrix.target != 'armv7-unknown-linux-gnueabihf' if: matrix.target == 'x86_64-unknown-linux-gnu' || matrix.target == 'aarch64-unknown-linux-gnu'
run: | run: |
cargo deb --package socktop_agent --target ${{ matrix.target }} --no-strip cargo deb --package socktop_agent --target ${{ matrix.target }} --no-strip
- name: Build socktop_agent .deb package (without GPU support for RISC-V and ARMv7) - name: Build socktop_agent .deb package (without GPU support)
if: matrix.target == 'riscv64gc-unknown-linux-gnu' || matrix.target == 'armv7-unknown-linux-gnueabihf' if: matrix.target == 'armv7-unknown-linux-gnueabihf' || matrix.target == 'riscv64gc-unknown-linux-gnu'
run: | run: |
cargo deb --package socktop_agent --target ${{ matrix.target }} --no-strip --no-default-features cargo deb --package socktop_agent --target ${{ matrix.target }} --no-strip --no-default-features