Do not use rustup to build Rust for Linux
This commit is contained in:
parent
d491662340
commit
e3117e6e18
1 changed files with 8 additions and 10 deletions
|
|
@ -8,16 +8,10 @@ LINUX_VERSION=v6.14-rc3
|
|||
../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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue