about summary refs log tree commit diff
path: root/library/stdarch/ci/docker
diff options
context:
space:
mode:
authorWANG Rui <wangrui@loongson.cn>2024-11-02 09:52:16 +0800
committerAmanieu d'Antras <amanieu@gmail.com>2024-11-03 01:27:20 +0800
commitb08aea9ec02033b843acc6187a25c7405dc3d816 (patch)
tree5091041b37ddbc5ed3cfe7b0138c81e218769c60 /library/stdarch/ci/docker
parent281fe5f4744e143e56fdfe88b58fb125fa7323c3 (diff)
downloadrust-b08aea9ec02033b843acc6187a25c7405dc3d816.tar.gz
rust-b08aea9ec02033b843acc6187a25c7405dc3d816.zip
ci: Use distro toolchain for loongarch64-unknown-linux-gnu
Diffstat (limited to 'library/stdarch/ci/docker')
-rw-r--r--library/stdarch/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile25
1 files changed, 10 insertions, 15 deletions
diff --git a/library/stdarch/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile b/library/stdarch/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile
index 267523bbfd9..d15ffcb7e83 100644
--- a/library/stdarch/ci/docker/loongarch64-unknown-linux-gnu/Dockerfile
+++ b/library/stdarch/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