use rust-toolchain file instead of rustup override

master
WangRunji 6 years ago
parent 95dfb7684f
commit c7d736acd4

@ -4,7 +4,7 @@ dist: xenial
language: rust language: rust
rust: nightly-2019-02-15 rust: nightly-2019-02-16
os: os:
- linux - linux

@ -20,7 +20,7 @@ Tested boards: QEMU, labeled-RISCV, K210, Raspberry Pi 3B+
### Environment ### Environment
* [Rust](https://www.rust-lang.org) toolchain at nightly-2019-02-15 * [Rust](https://www.rust-lang.org) toolchain at nightly-2019-02-16
* Cargo tools: [cargo-xbuild](https://github.com/rust-osdev/cargo-xbuild) * Cargo tools: [cargo-xbuild](https://github.com/rust-osdev/cargo-xbuild)
* [QEMU](https://www.qemu.org) >= 3.1.0 * [QEMU](https://www.qemu.org) >= 3.1.0
* [bootimage](https://github.com/rust-osdev/bootimage) (for x86_64) * [bootimage](https://github.com/rust-osdev/bootimage) (for x86_64)
@ -39,7 +39,6 @@ cargo install cargo-xbuild bootimage
```bash ```bash
git clone https://github.com/oscourse-tsinghua/rcore_plus.git --recursive git clone https://github.com/oscourse-tsinghua/rcore_plus.git --recursive
cd rcore_plus/kernel cd rcore_plus/kernel
rustup override set nightly-2019-02-15
make run arch={riscv32,riscv64,x86_64,aarch64} make run arch={riscv32,riscv64,x86_64,aarch64}
``` ```

@ -0,0 +1 @@
nightly-2019-02-16
Loading…
Cancel
Save