Skip to content

Commit 4887cb1

Browse files
committed
Auto merge of rust-lang#106711 - albertlarsan68:use-ci-llvm-when-lld, 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.
2 parents d4203ed + bd5a0f9 commit 4887cb1

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/ci/docker/host-x86_64/test-various/Dockerfile

-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ WORKDIR /
4141
COPY scripts/sccache.sh /scripts/
4242
RUN sh /scripts/sccache.sh
4343

44-
# We are disabling CI LLVM since this builder needs to build LLD, which is
45-
# currently unsupported when downloading pre-built LLVM.
46-
ENV NO_DOWNLOAD_CI_LLVM 1
47-
4844
ENV RUST_CONFIGURE_ARGS \
4945
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
5046
--set build.nodejs=/node-v15.14.0-linux-x64/bin/node \

0 commit comments

Comments
 (0)