diff options
| author | Ben Kimock <kimockb@gmail.com> | 2025-01-25 06:05:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-25 06:05:36 +0000 |
| commit | 57eabac8351013154cef7bac0f27759094ff5a96 (patch) | |
| tree | 6a131fb160b1ad071bb1a0c30add05ae64b48ebd /src/ci/docker | |
| parent | f8f5c9d64297f34a260abd882f752153e85102f3 (diff) | |
| parent | c9502079ed12d35de139416cd8e67e43b0b5bfd8 (diff) | |
Merge pull request #4150 from rust-lang/rustup-2025-01-25
Automatic Rustup
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 1 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/build-zstd.sh | 6 |
2 files changed, 7 insertions, 0 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 dde6fe7f6d0..3a396230582 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 @@ -34,6 +34,7 @@ RUN yum upgrade -y && \ python3 \ unzip \ wget \ + flex \ xz \ zlib-devel.i686 \ zlib-devel.x86_64 \ diff --git a/src/ci/docker/scripts/build-zstd.sh b/src/ci/docker/scripts/build-zstd.sh index a3d37ccc311..cffa7151e38 100755 --- a/src/ci/docker/scripts/build-zstd.sh +++ b/src/ci/docker/scripts/build-zstd.sh @@ -25,5 +25,11 @@ cd zstd-$ZSTD CFLAGS=-fPIC hide_output make -j$(nproc) VERBOSE=1 hide_output make install +# It doesn't seem to be possible to move destination directory +# of the `make install` above. We thus copy the built artifacts +# manually to our custom rustroot, so that it can be found through +# LD_LIBRARY_PATH. +cp /usr/local/lib/libzstd* /rustroot/lib64 + cd .. rm -rf zstd-$ZSTD |