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

Auto merge of #1427 - RalfJung:rustup, r=RalfJung

Browse Source 
rustup, and now we also need to install llvm-tools

Fixes fallout from https://github.com/rust-lang/rust/pull/72000
This commit is contained in:
bors 2020-05-22 08:30:35 +00:00
commit 427c8a6bb8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -30,7 +30,7 @@ install:
- rustup update
# Install "master" toolchain.
- cargo install rustup-toolchain-install-master
- rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c rust-src -c rustc-dev
- rustup-toolchain-install-master -f -n master %RUSTC_HASH% -c rust-src -c rustc-dev -c llvm-tools
- rustup default master
- rustc --version
- cargo --version

2
.travis.yml
View File

@ -36,7 +36,7 @@ before_script:
- rustup update
# Install "master" toolchain.
- cargo install rustup-toolchain-install-master
- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src -c rustc-dev
- travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH -c rust-src -c rustc-dev -c llvm-tools
- rustup default master
- rustc --version
- cargo --version

2
rust-version
View File

@ -1 +1 @@
458a3e76294fd859fb037f425404180c91e14767
c60b675e280fedded8d8487acd051cd342e486f2

2
rustup-toolchain
View File

@ -39,7 +39,7 @@ fi
# Install and setup new toolchain.
rustup toolchain uninstall miri
rustup-toolchain-install-master -n miri -c rust-src -c rustc-dev -- "$NEW_COMMIT"
rustup-toolchain-install-master -n miri -c rust-src -c rustc-dev -c llvm-tools -- "$NEW_COMMIT"
rustup override set miri
# Cleanup.