Merge branch 'main' into aix-skip-union

Author: xingxue-ibm

ci/docker/aarch64-unknown-linux-musl/Dockerfile

@@ -20,6 +20,6 @@ RUN /install-musl.sh aarch64 "$MUSL_VERSION"
 # FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std?
 ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \
     CC_aarch64_unknown_linux_musl=musl-gcc \
-    RUSTFLAGS='-Clink-args=-lgcc -L /musl-aarch64/lib' \
     CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc \
-    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER="qemu-aarch64 -L /musl-aarch64"
+    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER="qemu-aarch64 -L /musl-aarch64" \
+    EXTRA_RUSTFLAGS="-Clink-args=-lgcc -L /musl-aarch64/lib"

ci/docker/arm-unknown-linux-musleabihf/Dockerfile

@@ -24,4 +24,4 @@ ENV PATH=$PATH:/musl-arm/bin:/rust/bin \
     CC_arm_unknown_linux_musleabihf=musl-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=musl-gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_RUNNER="qemu-arm -L /musl-arm" \
-    RUSTFLAGS="-L /musl-arm/lib"
+    EXTRA_RUSTFLAGS="-L /musl-arm/lib"

ci/docker/i686-unknown-linux-musl/Dockerfile

@@ -22,4 +22,4 @@ RUN /install-musl.sh i686 "$MUSL_VERSION"
 
 ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
     CC_i686_unknown_linux_musl=musl-gcc \
-    RUSTFLAGS="-L /musl-i686/lib"
+    EXTRA_RUSTFLAGS="-L /musl-i686/lib"

ci/docker/loongarch64-unknown-linux-musl/Dockerfile

@@ -17,10 +17,10 @@ ARG MUSL_VERSION
 COPY install-musl.sh /
 RUN /install-musl.sh loongarch64 "$MUSL_VERSION"
 
-ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc \
-    CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_RUNNER="qemu-loongarch64" \
-    CC_loongarch64_unknown_linux_musl=musl-gcc \
+ENV CC_loongarch64_unknown_linux_musl=musl-gcc \
     CFLAGS_loongarch64_unknown_linux_musl="-mabi=lp64d -fPIC" \
-    RUSTFLAGS="-Ctarget-feature=+crt-static" \
+    CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc \
+    CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_RUNNER="qemu-loongarch64" \
+    EXTRA_RUSTFLAGS="-Ctarget-feature=+crt-static" \
     QEMU_LD_PREFIX=/musl-loongarch64 \
     PATH=$PATH:/musl-loongarch64/bin:/rust/bin

ci/docker/powerpc64le-unknown-linux-musl/Dockerfile

@@ -20,6 +20,6 @@ RUN /install-musl.sh powerpc64le "$MUSL_VERSION"
 # FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std?
 ENV PATH=$PATH:/musl-powerpc64/bin:/rust/bin \
     CC_powerpc64le_unknown_linux_musl=musl-gcc \
-    RUSTFLAGS='-Clink-args=-lgcc -L /musl-powerpc64/lib' \
     CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc \
-    CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_MUSL_RUNNER="qemu-ppc64le -L /musl-powerpc64"
+    CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_MUSL_RUNNER="qemu-ppc64le -L /musl-powerpc64" \
+    EXTRA_RUSTFLAGS="-Clink-args=-lgcc -L /musl-powerpc64/lib"

ci/docker/s390x-unknown-linux-musl/Dockerfile

@@ -15,8 +15,8 @@ COPY install-musl.sh /
 RUN /install-musl.sh s390x "$MUSL_VERSION"
 
 # FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std?
-ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
+ENV CC_s390x_unknown_linux_gnu=musl-gcc \
+    CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
     CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x -L /musl-s390x" \
-    CC_s390x_unknown_linux_gnu=musl-gcc \
-    RUSTFLAGS='-Clink-args=-lgcc -L /musl-s390x/lib' \
+    EXTRA_RUSTFLAGS="-Clink-args=-lgcc -L /musl-s390x/lib" \
     PATH=$PATH:/musl-s390x/bin:/rust/bin

ci/docker/wasm32-wasip1/Dockerfile

@@ -10,7 +10,7 @@ RUN /wasi.sh
 # library.
 ENV CARGO_TARGET_WASM32_WASIP1_RUNNER=wasmtime \
     CARGO_TARGET_WASM32_WASIP1_LINKER=/opt/wasi-sdk/bin/clang \
-    CARGO_TARGET_WASM32_WASIP1_RUSTFLAGS="-Clink-self-contained=n -lwasi-emulated-process-clocks" \
+    EXTRA_RUSTFLAGS="-Clink-self-contained=n -lwasi-emulated-process-clocks" \
     CC_wasm32_wasip1=/opt/wasi-sdk/bin/clang \
     CFLAGS_wasm32_wasip1=-D_WASI_EMULATED_PROCESS_CLOCKS \
     PATH=$PATH:/rust/bin:/wasmtime

ci/docker/wasm32-wasip2/Dockerfile

@@ -9,7 +9,7 @@ RUN /wasi.sh
 # itself, this should be fixed upstream.
 ENV CARGO_TARGET_WASM32_WASIP2_RUNNER=wasmtime \
     CARGO_TARGET_WASM32_WASIP2_LINKER=/opt/wasi-sdk/bin/clang \
-    CARGO_TARGET_WASM32_WASIP2_RUSTFLAGS="-Clink-self-contained=n -lwasi-emulated-process-clocks -Clink-arg=-Wl,--export,cabi_realloc" \
+    EXTRA_RUSTFLAGS="-Clink-self-contained=n -lwasi-emulated-process-clocks -Clink-arg=-Wl,--export,cabi_realloc" \
     CC_wasm32_wasip2=/opt/wasi-sdk/bin/clang \
     CFLAGS_wasm32_wasip2=-D_WASI_EMULATED_PROCESS_CLOCKS \
     PATH=$PATH:/rust/bin:/wasmtime

ci/docker/x86_64-unknown-linux-musl/Dockerfile

@@ -16,4 +16,4 @@ COPY install-musl.sh /
 RUN /install-musl.sh x86_64 "$MUSL_VERSION"
 
 ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin \
-    RUSTFLAGS="-L /musl-x86_64/lib"
+    EXTRA_RUSTFLAGS="-L /musl-x86_64/lib"

ci/run-docker.sh

@@ -59,6 +59,7 @@ run() {
         --user "$(id -u)":"$(id -g)" \
         --env LIBC_CI \
         --env LIBC_CI_ZBUILD_STD \
+        --env RUSTFLAGS \
         --env RUSTDOCFLAGS \
         --env RUST_BACKTRACE \
         --env RUST_LIBC_UNSTABLE_GNU_FILE_OFFSET_BITS \
@@ -68,9 +69,9 @@ run() {
         --env CARGO_TERM_VERBOSE \
         --env CARGO_HOME=/cargo \
         --env CARGO_TARGET_DIR=/checkout/target \
-        --volume "$CARGO_HOME":/cargo \
-        --volume "$(rustc --print sysroot)":/rust:ro \
-        --volume "$PWD":/checkout:ro \
+        --volume "$CARGO_HOME":/cargo:Z \
+        --volume "$(rustc --print sysroot)":/rust:ro,Z \
+        --volume "$PWD":/checkout:ro,Z \
         --volume "$PWD"/target:/checkout/target \
         $kvm \
         --init \