diff options
| author | Rémy Rakic <remy.rakic+github@gmail.com> | 2024-08-10 22:25:22 +0000 |
|---|---|---|
| committer | Rémy Rakic <remy.rakic+github@gmail.com> | 2024-08-25 22:17:51 +0000 |
| commit | 62c8c693bdda3932dbb049f8a2707f2f616d29eb (patch) | |
| tree | 42af2627342f7b7b538e784dc1c0351cbf99fccd /src/ci/docker | |
| parent | 1935e21029d28af3022064f57b36fff85b8db9d7 (diff) | |
| download | rust-62c8c693bdda3932dbb049f8a2707f2f616d29eb.tar.gz rust-62c8c693bdda3932dbb049f8a2707f2f616d29eb.zip | |
move and rename zstd script
move it where it's used, and name it like the other scripts
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 6 | ||||
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-x86_64-linux/build-zstd.sh (renamed from src/ci/docker/scripts/zstd.sh) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 61e9694f1e2..e857f38e68a 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -62,9 +62,9 @@ COPY host-x86_64/dist-x86_64-linux/build-clang.sh /tmp/ RUN ./build-clang.sh ENV CC=clang CXX=clang++ -# rustc's LLVM needs zstd. -COPY scripts/zstd.sh /tmp/ -RUN ./zstd.sh +# Build zstd to enable `llvm.libzstd`. +COPY host-x86_64/dist-x86_64-linux/build-zstd.sh /tmp/ +RUN ./build-zstd.sh COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh diff --git a/src/ci/docker/scripts/zstd.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-zstd.sh index a3d37ccc311..a3d37ccc311 100755 --- a/src/ci/docker/scripts/zstd.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-zstd.sh |