diff options
| author | bors <bors@rust-lang.org> | 2025-01-24 04:45:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-24 04:45:50 +0000 |
| commit | 48ef38d3503a04e5e18157e664e3e65dc7eca1a5 (patch) | |
| tree | d09e38e710791228d92059de5520d29cad21eeef /src/ci/docker/scripts | |
| parent | 1c9837df1dde9b234229709e89b3672bd3cf04a4 (diff) | |
| parent | b3fcd5697cfa1a377661d729ce353a0b9f506b8e (diff) | |
| download | rust-48ef38d3503a04e5e18157e664e3e65dc7eca1a5.tar.gz rust-48ef38d3503a04e5e18157e664e3e65dc7eca1a5.zip | |
Auto merge of #135959 - matthiaskrgr:rollup-0jenyfw, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #135366 (Enable `unreachable_pub` lint in `test` and `proc_macro` crates) - #135638 (Make it possible to build GCC on CI) - #135648 (support wasm inline assembly in `naked_asm!`) - #135827 (CI: free disk with in-tree script instead of GitHub Action) - #135855 (Only assert the `Parser` size on specific arches) - #135878 (ci: use 8 core arm runner for dist-aarch64-linux) - #135905 (Enable kernel sanitizers for aarch64-unknown-none-softfloat) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/build-zstd.sh | 6 |
1 files changed, 6 insertions, 0 deletions
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 |