diff options
| author | Laurențiu Nicola <lnicola@users.noreply.github.com> | 2025-02-10 06:07:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-10 06:07:06 +0000 |
| commit | 8fd713b7d3bc773b0911518c4e4ee7f1ac284220 (patch) | |
| tree | 1aa51f29a63a69ab827eb37366f0bcaada3da97e /src/ci/docker/scripts | |
| parent | d4f7c7668fece15523ae6f38e437cad01ee5ded6 (diff) | |
| parent | 24d7a1490a8193350b006b7a5f71edd97a63afd1 (diff) | |
| download | rust-8fd713b7d3bc773b0911518c4e4ee7f1ac284220.tar.gz rust-8fd713b7d3bc773b0911518c4e4ee7f1ac284220.zip | |
Merge pull request #19126 from lnicola/sync-from-rust
minor: Sync from downstream
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/build-zstd.sh | 6 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/rfl-build.sh | 4 |
2 files changed, 8 insertions, 2 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 diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh index 8776e0f0be9..3eb85ab215e 100755 --- a/src/ci/docker/scripts/rfl-build.sh +++ b/src/ci/docker/scripts/rfl-build.sh @@ -2,7 +2,7 @@ set -euo pipefail -LINUX_VERSION=v6.13-rc1 +LINUX_VERSION=50e57739141b41f731ab31f8380821c7969f9dc4 # Build rustc, rustdoc, cargo, clippy-driver and rustfmt ../x.py build --stage 2 library rustdoc clippy rustfmt @@ -28,7 +28,7 @@ rm -rf linux || true # Download Linux at a specific commit mkdir -p linux git -C linux init -git -C linux remote add origin https://github.com/Rust-for-Linux/linux.git +git -C linux remote add origin https://github.com/Darksonn/linux.git git -C linux fetch --depth 1 origin ${LINUX_VERSION} git -C linux checkout FETCH_HEAD |