Unrolled build for #153526

Rollup merge of #153526 - homersimpsons:chore/fix-LegacyKeyValueFormat-i686, r=marcoieni

Fix LegacyKeyValueFormat report from docker build: i686

Part of #152305

r? @marcoieni

Author: rust-timer

src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile

@@ -57,10 +57,9 @@ RUN ln -s /usr/lib32/libgcc_s.so.1 /musl-i686/lib/
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV RUST_CONFIGURE_ARGS \
-      --musl-root-i586=/musl-i586 \
+ENV RUST_CONFIGURE_ARGS="--musl-root-i586=/musl-i586 \
       --musl-root-i686=/musl-i686 \
-      --disable-docs
+      --disable-docs"
 
 # Newer binutils broke things on some vms/distros (i.e., linking against
 # unknown relocs disabled by the following flag), so we need to go out of our
@@ -73,6 +72,5 @@ ENV CFLAGS_i586_unknown_linux_musl=-Wa,-mrelax-relocations=no
 
 ENV TARGETS=i586-unknown-linux-gnu,i686-unknown-linux-musl
 
-ENV SCRIPT \
-      python3 ../x.py --stage 2 test --host='' --target $TARGETS && \
-      python3 ../x.py dist --host='' --target $TARGETS,i586-unknown-linux-musl
+ENV SCRIPT="python3 ../x.py --stage 2 test --host= --target $TARGETS && \
+      python3 ../x.py dist --host= --target $TARGETS,i586-unknown-linux-musl"

src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile

@@ -70,15 +70,14 @@ RUN sh /scripts/sccache.sh
 
 ENV HOSTS=i686-unknown-linux-gnu
 
-ENV RUST_CONFIGURE_ARGS \
-      --enable-full-tools \
+ENV RUST_CONFIGURE_ARGS="--enable-full-tools \
       --enable-sanitizers \
       --enable-profiler \
       --set target.i686-unknown-linux-gnu.linker=clang \
       --build=i686-unknown-linux-gnu \
       --set llvm.ninja=false \
-      --set rust.jemalloc
-ENV SCRIPT python3 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS
+      --set rust.jemalloc"
+ENV SCRIPT="python3 ../x.py dist --build $HOSTS --host $HOSTS --target $HOSTS"
 ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=clang
 
 # This was added when we switched from gcc to clang. It's not clear why this is
@@ -89,17 +88,17 @@ ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER=clang
 # misaligned stack access.
 #
 # Added in #50200 there's some more logs there
-ENV CFLAGS -mstackrealign
+ENV CFLAGS="-mstackrealign"
 
 # When we build cargo in this container, we don't want it to use the system
 # libcurl, instead it should compile its own.
-ENV LIBCURL_NO_PKG_CONFIG 1
+ENV LIBCURL_NO_PKG_CONFIG="1"
 
 # There was a bad interaction between "old" 32-bit binaries on current 64-bit
 # kernels with selinux enabled, where ASLR mmap would sometimes choose a low
 # address and then block it for being below `vm.mmap_min_addr` -> `EACCES`.
 # This is probably a kernel bug, but setting `ulimit -Hs` works around it.
 # See also `src/ci/run.sh` where this takes effect.
-ENV SET_HARD_RLIMIT_STACK 1
+ENV SET_HARD_RLIMIT_STACK="1"
 
-ENV DIST_REQUIRE_ALL_TOOLS 1
+ENV DIST_REQUIRE_ALL_TOOLS="1"

src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile

@@ -22,8 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
+ENV RUST_CONFIGURE_ARGS="--build=i686-unknown-linux-gnu --disable-optimize-tests"
 COPY scripts/stage_2_test_set1.sh /scripts/
 COPY scripts/stage_2_test_set2.sh /scripts/
 COPY scripts/i686-gnu-nopt-2.sh /scripts/
-ENV SCRIPT "Must specify DOCKER_SCRIPT for this image"
+ENV SCRIPT="Must specify DOCKER_SCRIPT for this image"

src/ci/docker/host-x86_64/i686-gnu/Dockerfile

@@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
+ENV RUST_CONFIGURE_ARGS="--build=i686-unknown-linux-gnu"
 COPY scripts/stage_2_test_set1.sh /scripts/
 COPY scripts/stage_2_test_set2.sh /scripts/
-ENV SCRIPT "Must specify DOCKER_SCRIPT for this image"
+ENV SCRIPT="Must specify DOCKER_SCRIPT for this image"