Skip to content

Commit

Permalink
Auto merge of rust-lang#106711 - albertlarsan68:use-ci-llvm-when-lld,…
Browse files Browse the repository at this point in the history
… r=jyn514

Use CI LLVM in `test-various` builder

It was disabled because it needs `lld`, but since rust-lang#104748 was merged it is no longer needed.

This will speed this test, since it no longer needs to build LLVM.
  • Loading branch information
bors committed Jan 12, 2023
2 parents d4203ed + bd5a0f9 commit 4887cb1
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/ci/docker/host-x86_64/test-various/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ WORKDIR /
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

# We are disabling CI LLVM since this builder needs to build LLD, which is
# currently unsupported when downloading pre-built LLVM.
ENV NO_DOWNLOAD_CI_LLVM 1

ENV RUST_CONFIGURE_ARGS \
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
--set build.nodejs=/node-v15.14.0-linux-x64/bin/node \
Expand Down

0 comments on commit 4887cb1

Please sign in to comment.