diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-03-03 19:49:35 +0100 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2025-03-07 17:21:47 -0800 |
| commit | 0bd07383074854e3458763b4193d6d14f4683a17 (patch) | |
| tree | 6703a7722714a6a6db266bb1311869fb0c7db03a | |
| parent | cd87b034d23269ae6cd4b9bba1a4d016e96b404b (diff) | |
| download | rust-0bd07383074854e3458763b4193d6d14f4683a17.tar.gz rust-0bd07383074854e3458763b4193d6d14f4683a17.zip | |
Do not use rustup to build Rust for Linux
(cherry picked from commit e3117e6e1834838bce446517d7541dda395032d8)
| -rwxr-xr-x | src/ci/docker/scripts/rfl-build.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh index 3eb85ab215e..22468d84678 100755 --- a/src/ci/docker/scripts/rfl-build.sh +++ b/src/ci/docker/scripts/rfl-build.sh @@ -8,16 +8,10 @@ LINUX_VERSION=50e57739141b41f731ab31f8380821c7969f9dc4 ../x.py build --stage 2 library rustdoc clippy rustfmt ../x.py build --stage 0 cargo -# Install rustup so that we can use the built toolchain easily, and also -# install bindgen in an easy way. -curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs -sh rustup.sh -y --default-toolchain none +BUILD_DIR=$(realpath ./build/x86_64-unknown-linux-gnu) -source /cargo/env - -BUILD_DIR=$(realpath ./build) -rustup toolchain link local "${BUILD_DIR}"/x86_64-unknown-linux-gnu/stage2 -rustup default local +# Provide path to rustc, rustdoc, clippy-driver and rustfmt to RfL +export PATH=${PATH}:${BUILD_DIR}/stage2/bin mkdir -p rfl cd rfl @@ -33,10 +27,14 @@ git -C linux fetch --depth 1 origin ${LINUX_VERSION} git -C linux checkout FETCH_HEAD # Install bindgen -"${BUILD_DIR}"/x86_64-unknown-linux-gnu/stage0/bin/cargo install \ +"${BUILD_DIR}"/stage0/bin/cargo install \ --version $(linux/scripts/min-tool-version.sh bindgen) \ + --root ${BUILD_DIR}/bindgen \ bindgen-cli +# Provide path to bindgen to RfL +export PATH=${PATH}:${BUILD_DIR}/bindgen/bin + # Configure Rust for Linux cat <<EOF > linux/kernel/configs/rfl-for-rust-ci.config # CONFIG_WERROR is not set |