Commit c990a19

Kobzolcuviper

authored and

committed

Do not use rustup to build Rust for Linux

(cherry picked from commit e3117e6)

1 parent 0e8fd2d commit c990a19Copy full SHA for c990a19

File tree

1 file changed

-10

lines changed

src/ci/docker/scripts
- rfl-build.sh

1 file changed

-10

lines changed

`‎src/ci/docker/scripts/rfl-build.sh`

Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,10 @@ LINUX_VERSION=v6.13-rc1`
`8`	`8`	`../x.py build --stage 2 library rustdoc clippy rustfmt`
`9`	`9`	`../x.py build --stage 0 cargo`
`10`	`10`
`11`		`-# Install rustup so that we can use the built toolchain easily, and also`
`12`		`-# install bindgen in an easy way.`
`13`		`-curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs`
`14`		`-sh rustup.sh -y --default-toolchain none`
	`11`	`+BUILD_DIR=$(realpath ./build/x86_64-unknown-linux-gnu)`
`15`	`12`
`16`		`-source /cargo/env`
`17`		`-`
`18`		`-BUILD_DIR=$(realpath ./build)`
`19`		`-rustup toolchain link local "${BUILD_DIR}"/x86_64-unknown-linux-gnu/stage2`
`20`		`-rustup default local`
	`13`	`+# Provide path to rustc, rustdoc, clippy-driver and rustfmt to RfL`
	`14`	`+export PATH=${PATH}:${BUILD_DIR}/stage2/bin`
`21`	`15`
`22`	`16`	`mkdir -p rfl`
`23`	`17`	`cd rfl`
`@@ -33,10 +27,14 @@ git -C linux fetch --depth 1 origin ${LINUX_VERSION}`
`33`	`27`	`git -C linux checkout FETCH_HEAD`
`34`	`28`
`35`	`29`	`# Install bindgen`
`36`		`-"${BUILD_DIR}"/x86_64-unknown-linux-gnu/stage0/bin/cargo install \`
	`30`	`+"${BUILD_DIR}"/stage0/bin/cargo install \`
`37`	`31`	`--version $(linux/scripts/min-tool-version.sh bindgen) \`
	`32`	`+ --root ${BUILD_DIR}/bindgen \`
`38`	`33`	`bindgen-cli`
`39`	`34`
	`35`	`+# Provide path to bindgen to RfL`
	`36`	`+export PATH=${PATH}:${BUILD_DIR}/bindgen/bin`
	`37`	`+`
`40`	`38`	`# Configure Rust for Linux`
`41`	`39`	`cat <<EOF > linux/kernel/configs/rfl-for-rust-ci.config`
`42`	`40`	`# CONFIG_WERROR is not set`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit c990a19

File tree

1 file changed

1 file changed

`‎src/ci/docker/scripts/rfl-build.sh`

0 commit comments