Merge pull request #630 from Kloenk/fix_if_available

ojeda · web-flow · commit 499f1a0bf7ca · 2022-01-19T19:28:47.000+01:00
scripts: fix RUST_LIB_SRC detection
diff --git a/scripts/rust-is-available.sh b/scripts/rust-is-available.sh
@@ -146,7 +146,7 @@ fi
 #
 # `$KRUSTFLAGS` is passed in case the user added `--sysroot`.
 rustc_sysroot=$("$RUSTC" $KRUSTFLAGS --print sysroot)
-rustc_src="$rustc_sysroot/lib/rustlib/src/rust/library"
+rustc_src=${RUST_LIB_SRC:-"$rustc_sysroot/lib/rustlib/src/rust/library"}
 rustc_src_core="$rustc_src/core/src/lib.rs"
 if [ ! -e "$rustc_src_core" ]; then
 	if [ "$1" = -v ]; then

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ fi`
`146`	`146`	`#`
`147`	`147`	# `$KRUSTFLAGS` is passed in case the user added `--sysroot`.
`148`	`148`	`rustc_sysroot=$("$RUSTC" $KRUSTFLAGS --print sysroot)`
`149`		`-rustc_src="$rustc_sysroot/lib/rustlib/src/rust/library"`
	`149`	`+rustc_src=${RUST_LIB_SRC:-"$rustc_sysroot/lib/rustlib/src/rust/library"}`
`150`	`150`	`rustc_src_core="$rustc_src/core/src/lib.rs"`
`151`	`151`	`if [ ! -e "$rustc_src_core" ]; then`
`152`	`152`	`if [ "$1" = -v ]; then`