diff options
| author | Albert Larsan <74931857+albertlarsan68@users.noreply.github.com> | 2023-01-11 08:38:16 +0000 |
|---|---|---|
| committer | Albert Larsan <74931857+albertlarsan68@users.noreply.github.com> | 2023-01-11 08:38:16 +0000 |
| commit | bd5a0f956e342c263f43ffe293626ff954443232 (patch) | |
| tree | 5be34b337f0055b722847703feb6870163860877 | |
| parent | bf7ea0d11b07d84cfbd18feac0ed59e6d1da87ab (diff) | |
| download | rust-bd5a0f956e342c263f43ffe293626ff954443232.tar.gz rust-bd5a0f956e342c263f43ffe293626ff954443232.zip | |
Use CI LLVM in `test-various` builder
It was disabled because it needs lld, but since 104748 was merged it is no longer needed.
| -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 cf4451f8b33..a59423ea380 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 \ |