Use crosstool-ng for dist-arm-linux-musl

Almost all of the musl dist jobs use crosstool-ng, only the aarch64 and
x86_64 jobs use musl-cross-make. Let's start transitioning the remaining
jobs over to crosstool-ng and start dropping musl-cross-make.

Signed-off-by: Jens Reidel <[email protected]>

Author: Gelbpunkt

src/ci/docker/host-x86_64/dist-arm-linux-musl/Dockerfile

@@ -6,16 +6,9 @@ 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/
-# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
-RUN CFLAGS="-Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \
-    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/
@@ -25,13 +18,21 @@ RUN /scripts/crosstool-ng-build.sh
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
+ENV PATH=$PATH:/x-tools/aarch64-unknown-linux-musl/bin
+
+ENV \
+    AR_aarch64_unknown_linux_musl=aarch64-unknown-linux-musl-ar \
+    CC_aarch64_unknown_linux_musl=aarch64-unknown-linux-musl-gcc \
+    CXX_aarch64_unknown_linux_musl=aarch64-unknown-linux-musl-g++
+
 ENV HOSTS=aarch64-unknown-linux-musl
 
 ENV RUST_CONFIGURE_ARGS \
       --enable-full-tools \
-      --disable-docs \
-      --musl-root-aarch64=/usr/local/aarch64-linux-musl \
-      --enable-sanitizers \
       --enable-profiler \
-      --set target.aarch64-unknown-linux-musl.crt-static=false
+      --enable-sanitizers \
+      --disable-docs \
+      --set target.aarch64-unknown-linux-musl.crt-static=false \
+      --musl-root-aarch64=/x-tools/aarch64-unknown-linux-musl/aarch64-unknown-linux-musl/sysroot/usr
+
 ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS

src/ci/docker/host-x86_64/dist-arm-linux-musl/arm-linux-musl.defconfig

@@ -3,11 +3,11 @@ 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_ARCH_64=y
+# CT_DEMULTILIB is not set
 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_LINUX_V_4_19=y
+CT_LIBC_MUSL=y
+CT_MUSL_V_1_2_3=y
 CT_CC_LANG_CXX=y
+CT_GETTEXT_NEEDED=y