Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 25813dd

Browse files
committed
Don't install zstd until after the first LLVM build.
1 parent 069f0bb commit 25813dd

File tree

1 file changed

+4
-4
lines changed
  • src/ci/docker/host-x86_64/dist-x86_64-linux

1 file changed

+4
-4
lines changed

src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ RUN ./build-gcc.sh && yum remove -y gcc gcc-c++
5656
COPY scripts/cmake.sh /tmp/
5757
RUN ./cmake.sh
5858

59-
# rustc's LLVM needs zstd.
60-
COPY scripts/zstd.sh /tmp/
61-
RUN ./zstd.sh
62-
6359
# Now build LLVM+Clang, afterwards configuring further compilations to use the
6460
# clang/clang++ compilers.
6561
COPY host-x86_64/dist-x86_64-linux/build-clang.sh /tmp/
6662
RUN ./build-clang.sh
6763
ENV CC=clang CXX=clang++
6864

65+
# rustc's LLVM needs zstd.
66+
COPY scripts/zstd.sh /tmp/
67+
RUN ./zstd.sh
68+
6969
COPY scripts/sccache.sh /scripts/
7070
RUN sh /scripts/sccache.sh
7171

0 commit comments

Comments
 (0)