mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move rustup component installation to rust-toolchain

Browse Source 
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:
bjorn3 2022-01-24 19:45:38 +01:00
parent cd5d42aad7
commit 6663f4e78e
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cargo.sh
View File

@ -8,7 +8,7 @@ pushd $(dirname "$0") >/dev/null
source config.sh source config.sh
# read nightly compiler from rust-toolchain file # read nightly compiler from rust-toolchain file
TOOLCHAIN=$(cat rust-toolchain) TOOLCHAIN=$(cat rust-toolchain | grep channel | sed 's/channel = "\(.*\)"/\1/')
popd >/dev/null popd >/dev/null

1
prepare_build.sh
View File

@ -1,5 +1,4 @@
#!/bin/bash --verbose #!/bin/bash --verbose
set -e set -e
rustup component add rust-src rustc-dev llvm-tools-preview
./build_sysroot/prepare_sysroot_src.sh ./build_sysroot/prepare_sysroot_src.sh

4
rust-toolchain
View File

@ -1 +1,3 @@
nightly-2021-12-30 [toolchain]
channel = "nightly-2021-12-30"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

2
test.sh
View File

@ -145,7 +145,7 @@ function test_rustc() {
echo echo
echo "[TEST] rust-lang/rust" echo "[TEST] rust-lang/rust"
rust_toolchain=$(cat rust-toolchain) rust_toolchain=$(cat rust-toolchain | grep channel | sed 's/channel = "\(.*\)"/\1/')
git clone https://github.com/rust-lang/rust.git || true git clone https://github.com/rust-lang/rust.git || true
cd rust cd rust