diff --git a/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile b/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile index 04b46226acfa4..7bc91243a5e2f 100644 --- a/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile +++ b/src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile @@ -29,19 +29,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh -ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS 1 +ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS="1" # llvm.use-linker conflicts with downloading CI LLVM -ENV NO_DOWNLOAD_CI_LLVM 1 +ENV NO_DOWNLOAD_CI_LLVM="1" -ENV RUST_CONFIGURE_ARGS \ - --build=aarch64-unknown-linux-gnu \ +ENV RUST_CONFIGURE_ARGS="--build=aarch64-unknown-linux-gnu \ --enable-debug \ --enable-lld \ --set llvm.use-linker=lld \ --set target.aarch64-unknown-linux-gnu.linker=clang \ --set target.aarch64-unknown-linux-gnu.cc=clang \ - --set target.aarch64-unknown-linux-gnu.cxx=clang++ + --set target.aarch64-unknown-linux-gnu.cxx=clang++" # This job appears to be checking two separate things: # - That we can build the compiler with `--enable-debug` @@ -52,6 +51,5 @@ ENV RUST_CONFIGURE_ARGS \ # Currently we only run the subset of tests with "clang" in their name. # - See also FIXME(#132034) -ENV SCRIPT \ - python3 ../x.py --stage 2 build && \ - python3 ../x.py --stage 2 test tests/run-make tests/run-make-cargo +ENV SCRIPT="python3 ../x.py --stage 2 build && \ + python3 ../x.py --stage 2 test tests/run-make tests/run-make-cargo"