Skip to content

Commit 93cddab

Browse files
authored
Unrolled build for #153109
Rollup merge of #153109 - homersimpsons:chore/fix-LegacyKeyValueFormat-aarch64-gnu-debug, r=marcoieni Fix LegacyKeyValueFormat report from docker build: aarch64-gnu-debug Part of #152305 r? @marcoieni
2 parents 1d113d2 + 6df2169 commit 93cddab

File tree

1 file changed

+6
-8
lines changed
  • src/ci/docker/host-aarch64/aarch64-gnu-debug

1 file changed

+6
-8
lines changed

src/ci/docker/host-aarch64/aarch64-gnu-debug/Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2929
COPY scripts/sccache.sh /scripts/
3030
RUN sh /scripts/sccache.sh
3131

32-
ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS 1
32+
ENV RUSTBUILD_FORCE_CLANG_BASED_TESTS="1"
3333

3434
# llvm.use-linker conflicts with downloading CI LLVM
35-
ENV NO_DOWNLOAD_CI_LLVM 1
35+
ENV NO_DOWNLOAD_CI_LLVM="1"
3636

37-
ENV RUST_CONFIGURE_ARGS \
38-
--build=aarch64-unknown-linux-gnu \
37+
ENV RUST_CONFIGURE_ARGS="--build=aarch64-unknown-linux-gnu \
3938
--enable-debug \
4039
--enable-lld \
4140
--set llvm.use-linker=lld \
4241
--set target.aarch64-unknown-linux-gnu.linker=clang \
4342
--set target.aarch64-unknown-linux-gnu.cc=clang \
44-
--set target.aarch64-unknown-linux-gnu.cxx=clang++
43+
--set target.aarch64-unknown-linux-gnu.cxx=clang++"
4544

4645
# This job appears to be checking two separate things:
4746
# - That we can build the compiler with `--enable-debug`
@@ -52,6 +51,5 @@ ENV RUST_CONFIGURE_ARGS \
5251
# Currently we only run the subset of tests with "clang" in their name.
5352
# - See also FIXME(#132034)
5453

55-
ENV SCRIPT \
56-
python3 ../x.py --stage 2 build && \
57-
python3 ../x.py --stage 2 test tests/run-make tests/run-make-cargo
54+
ENV SCRIPT="python3 ../x.py --stage 2 build && \
55+
python3 ../x.py --stage 2 test tests/run-make tests/run-make-cargo"

0 commit comments

Comments
 (0)