From 4c30a3835ecbfe313ca0fb73014e28eceb2239d2 Mon Sep 17 00:00:00 2001 From: Ivan Velickovic Date: Thu, 3 Oct 2024 19:30:08 +1000 Subject: [PATCH] Use rust-lld for linking tool on Linux AArch64 Doesn't require a new dependency and still seems to work. Signed-off-by: Ivan Velickovic --- .github/workflows/sdk.yaml | 3 +-- tool/microkit/.cargo/config.toml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sdk.yaml b/.github/workflows/sdk.yaml index 84137213..15ee1863 100644 --- a/.github/workflows/sdk.yaml +++ b/.github/workflows/sdk.yaml @@ -45,8 +45,7 @@ jobs: texlive-fonts-recommended texlive-fonts-extra \ libxml2-utils \ python3.9 python3-pip python3.9-venv \ - qemu-system-arm qemu-system-misc \ - gcc-aarch64-linux-gnu + qemu-system-arm qemu-system-misc python3.9 -m venv pyenv ./pyenv/bin/pip install --upgrade pip setuptools wheel ./pyenv/bin/pip install -r requirements.txt diff --git a/tool/microkit/.cargo/config.toml b/tool/microkit/.cargo/config.toml index fe6baea7..eeb02835 100644 --- a/tool/microkit/.cargo/config.toml +++ b/tool/microkit/.cargo/config.toml @@ -2,4 +2,4 @@ # SPDX-License-Identifier: BSD-2-Clause [target.aarch64-unknown-linux-musl] -linker = "aarch64-linux-gnu-ld" +rustflags = ["-Clinker=rust-lld"]