diff options
| author | bors <bors@rust-lang.org> | 2023-01-12 04:58:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-12 04:58:03 +0000 |
| commit | 4887cb18dc2ef5b1bf3fc50ce6c267fde085032b (patch) | |
| tree | 1ba0142bbf12eb0fd79332b21667117d4d85b929 | |
| parent | d4203eda5f0dd0b0192bfd22ea5989fbaf917818 (diff) | |
| parent | bd5a0f956e342c263f43ffe293626ff954443232 (diff) | |
| download | rust-4887cb18dc2ef5b1bf3fc50ce6c267fde085032b.tar.gz rust-4887cb18dc2ef5b1bf3fc50ce6c267fde085032b.zip | |
Auto merge of #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 #104748 was merged it is no longer needed. This will speed this test, since it no longer needs to build LLVM.
| -rw-r--r-- | src/ci/docker/host-x86_64/test-various/Dockerfile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/ci/docker/host-x86_64/test-various/Dockerfile b/src/ci/docker/host-x86_64/test-various/Dockerfile index 930f58baf02..62e3f627ec0 100644 --- a/src/ci/docker/host-x86_64/test-various/Dockerfile +++ b/src/ci/docker/host-x86_64/test-various/Dockerfile @@ -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 \ |