Rollup merge of #153527 - homersimpsons:chore/fix-LegacyKeyValueFormat-ohos, r=marcoieni

Fix LegacyKeyValueFormat report from docker build: ohos

Part of #152305

r? @marcoieni

Author: JonathanBrouwer

src/ci/docker/host-x86_64/dist-ohos-aarch64/Dockerfile

@@ -40,14 +40,13 @@ ENV \
     AR_aarch64_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
     CXX_aarch64_unknown_linux_ohos=/usr/local/bin/aarch64-unknown-linux-ohos-clang++.sh
 
-ENV RUST_CONFIGURE_ARGS \
-    --enable-profiler \
+ENV RUST_CONFIGURE_ARGS="--enable-profiler \
     --disable-docs \
     --tools=cargo,clippy,rustdocs,rustfmt,rust-analyzer,rust-analyzer-proc-macro-srv,analysis,src,wasm-component-ld \
     --enable-extended \
-    --enable-sanitizers
+    --enable-sanitizers"
 
-ENV SCRIPT python3 ../x.py dist --host=$TARGETS --target $TARGETS
+ENV SCRIPT="python3 ../x.py dist --host=$TARGETS --target $TARGETS"
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/dist-ohos-x86_64/Dockerfile

@@ -40,14 +40,13 @@ ENV \
     AR_x86_64_unknown_linux_ohos=/opt/ohos-sdk/native/llvm/bin/llvm-ar \
     CXX_x86_64_unknown_linux_ohos=/usr/local/bin/x86_64-unknown-linux-ohos-clang++.sh
 
-ENV RUST_CONFIGURE_ARGS \
-    --enable-profiler \
+ENV RUST_CONFIGURE_ARGS="--enable-profiler \
     --disable-docs \
     --tools=cargo,clippy,rustdocs,rustfmt,rust-analyzer,rust-analyzer-proc-macro-srv,analysis,src,wasm-component-ld \
     --enable-extended \
-    --enable-sanitizers
+    --enable-sanitizers"
 
-ENV SCRIPT python3 ../x.py dist --host=$TARGETS --target $TARGETS
+ENV SCRIPT="python3 ../x.py dist --host=$TARGETS --target $TARGETS"
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh