From e37374b1ac6f2f05919aab5db6758b8fc4b8adee Mon Sep 17 00:00:00 2001 From: WANG Rui Date: Fri, 13 Feb 2026 16:07:14 +0800 Subject: [PATCH] ci: dist-arm-linux: Cleanup unused crosstool-ng --- .../host-x86_64/dist-arm-linux-musl/Dockerfile | 9 --------- .../dist-arm-linux-musl/arm-linux-musl.defconfig | 14 -------------- 2 files changed, 23 deletions(-) delete mode 100644 src/ci/docker/host-x86_64/dist-arm-linux-musl/arm-linux-musl.defconfig diff --git a/src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile index 6e055cd2bd5a..dc35285dbab9 100644 --- a/src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile @@ -3,9 +3,6 @@ FROM ghcr.io/rust-lang/ubuntu:22.04 COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh -COPY scripts/crosstool-ng.sh /scripts/ -RUN sh /scripts/crosstool-ng.sh - WORKDIR /build COPY scripts/musl-toolchain.sh /build/ @@ -14,14 +11,8 @@ RUN CFLAGS="-Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=non CXXFLAGS="-Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \ bash musl-toolchain.sh aarch64 && rm -rf build -COPY scripts/rustbuild-setup.sh /scripts/ -RUN sh /scripts/rustbuild-setup.sh WORKDIR /tmp -COPY scripts/crosstool-ng-build.sh /scripts/ -COPY host-x86_64/dist-arm-linux-musl/arm-linux-musl.defconfig /tmp/crosstool.defconfig -RUN /scripts/crosstool-ng-build.sh - COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh diff --git a/src/ci/docker/host-x86_64/dist-arm-linux-musl/arm-linux-musl.defconfig b/src/ci/docker/host-x86_64/dist-arm-linux-musl/arm-linux-musl.defconfig deleted file mode 100644 index 014930052b4a..000000000000 --- a/src/ci/docker/host-x86_64/dist-arm-linux-musl/arm-linux-musl.defconfig +++ /dev/null @@ -1,14 +0,0 @@ -CT_CONFIG_VERSION="4" -CT_PREFIX_DIR="/x-tools/${CT_TARGET}" -CT_USE_MIRROR=y -CT_MIRROR_BASE_URL="https://ci-mirrors.rust-lang.org/rustc" -CT_ARCH_ARM=y -CT_ARCH_ARCH="armv6" -CT_ARCH_FLOAT_SW=y -CT_KERNEL_LINUX=y -CT_LINUX_V_3_2=y -CT_BINUTILS_V_2_32=y -CT_GLIBC_V_2_17=y -CT_GCC_V_8=y -CT_CC_LANG_CXX=y -CT_MUSL_V_1_2_5=y