From 42a3e8783861e82a58a769df8e2e718b38cd25cd Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Fri, 22 May 2020 10:29:47 +0200
Subject: [PATCH] rustup, and now we also need to install llvm-tools

---
 .appveyor.yml    | 2 +-
 .travis.yml      | 2 +-
 rust-version     | 2 +-
 rustup-toolchain | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 34887459f6d..5cb5267a6da 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -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
diff --git a/.travis.yml b/.travis.yml
index 1605737a7b0..fcef17b124d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/rust-version b/rust-version
index 0b9281beeb4..a4414470549 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-458a3e76294fd859fb037f425404180c91e14767
+c60b675e280fedded8d8487acd051cd342e486f2
diff --git a/rustup-toolchain b/rustup-toolchain
index 4e8e0b01ebc..3fbebe1565f 100755
--- a/rustup-toolchain
+++ b/rustup-toolchain
@@ -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.