diff --git a/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile b/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile index 267523bbfd..d15ffcb7e8 100644 --- a/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile +++ b/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile @@ -1,16 +1,11 @@ FROM ubuntu:24.04 -RUN \ - apt-get update && \ - apt-get install -y --no-install-recommends gcc libc6-dev ca-certificates wget xz-utils && \ - wget "https://github.com/loongson/build-tools/releases/download/2024.08.08/x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0.tar.xz" && \ - tar -xvf x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0.tar.xz -C / && \ - rm x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0.tar.xz && \ - wget "https://github.com/loongson/build-tools/releases/download/2024.08.08/x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0-glibc_2.40.tar.xz" && \ - tar -xvf x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0-glibc_2.40.tar.xz -C / && \ - rm x86_64-cross-tools-loongarch64-binutils_2.43-gcc_14.2.0-glibc_2.40.tar.xz && \ - wget "https://github.com/loongson/build-tools/releases/download/2023.08.08/qemu-loongarch64" && \ - install -m 755 qemu-loongarch64 /cross-tools/bin/qemu-loongarch64 && \ - rm qemu-loongarch64 -ENV \ - CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER="/cross-tools/bin/loongarch64-unknown-linux-gnu-gcc" \ - CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_RUNNER="/cross-tools/bin/qemu-loongarch64 -L /cross-tools/target -E LD_LIBRARY_PATH=/cross-tools/loongarch64-unknown-linux-gnu/lib" + +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gcc libc6-dev qemu-user-static ca-certificates \ + gcc-14-loongarch64-linux-gnu libc6-dev-loong64-cross + + +ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_LINKER=loongarch64-linux-gnu-gcc-14 \ + CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-loongarch64-static -L /usr/loongarch64-linux-gnu" \ + OBJDUMP=loongarch64-linux-gnu-objdump