Move rustup component installation to rust-toolchain
This allows cargo check to function correctly without having to first run prepare_build.sh. cg_clif has been using rust-toolchain too for a while now.
This commit is contained in:
parent
cd5d42aad7
commit
6663f4e78e
2
cargo.sh
2
cargo.sh
@ -8,7 +8,7 @@ pushd $(dirname "$0") >/dev/null
|
||||
source config.sh
|
||||
|
||||
# read nightly compiler from rust-toolchain file
|
||||
TOOLCHAIN=$(cat rust-toolchain)
|
||||
TOOLCHAIN=$(cat rust-toolchain | grep channel | sed 's/channel = "\(.*\)"/\1/')
|
||||
|
||||
popd >/dev/null
|
||||
|
||||
|
@ -1,5 +1,4 @@
|
||||
#!/bin/bash --verbose
|
||||
set -e
|
||||
|
||||
rustup component add rust-src rustc-dev llvm-tools-preview
|
||||
./build_sysroot/prepare_sysroot_src.sh
|
||||
|
@ -1 +1,3 @@
|
||||
nightly-2021-12-30
|
||||
[toolchain]
|
||||
channel = "nightly-2021-12-30"
|
||||
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
|
||||
|
Loading…
Reference in New Issue
Block a user