X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=setup-toolchain.sh;h=469cba1874d652446b61bb14216f835926cf9ef2;hb=6527c3d99c2a33c5b44441b49b8664e554d12365;hp=9110d7dbffc0b66f2d118192f9e74edac99af104;hpb=b5a6714155c46c75df55cd5116de343811763727;p=rust.git

diff --git a/setup-toolchain.sh b/setup-toolchain.sh
index 9110d7dbffc..469cba1874d 100755
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -5,16 +5,15 @@ set -e
 
 cd "$(dirname "$0")"
 
-RTIM_PATH=$(command -v rustup-toolchain-install-master)
+RTIM_PATH=$(command -v rustup-toolchain-install-master) || INSTALLED=false
 CARGO_HOME=${CARGO_HOME:-$HOME/.cargo}
 
-# Check if people also install RTIM in other locations beside
-# ~/.cargo/bin
-if [[ "$RTIM_PATH" == $CARGO_HOME/bin/rustup-toolchain-install-master ]]; then
+# Check if RTIM is not installed or installed in other locations not in ~/.cargo/bin
+if [[ "$INSTALLED" == false || "$RTIM_PATH" == $CARGO_HOME/bin/rustup-toolchain-install-master ]]; then
     cargo +nightly install rustup-toolchain-install-master
 else
     VERSION=$(rustup-toolchain-install-master -V | grep -o "[0-9.]*")
-    REMOTE=$(cargo search rustup-toolchain-install-master | grep -o "[0-9.]*")
+    REMOTE=$(cargo +nightly search rustup-toolchain-install-master | grep -o "[0-9.]*")
     echo "info: skipping updating rustup-toolchain-install-master at $RTIM_PATH"
     echo "      current version : $VERSION"
     echo "      remote version  : $REMOTE"
@@ -27,5 +26,11 @@ if rustc +master -Vv 2>/dev/null | grep -q "$RUST_COMMIT"; then
     exit 0
 fi
 
-rustup-toolchain-install-master -f -n master -c rustc-dev -- "$RUST_COMMIT"
+if [[ -n "$HOST_TOOLCHAIN" ]]; then
+    TOOLCHAIN=('--host' "$HOST_TOOLCHAIN")
+else
+    TOOLCHAIN=()
+fi
+
+rustup-toolchain-install-master -f -n master "${TOOLCHAIN[@]}" -c rustc-dev -- "$RUST_COMMIT"
 rustup override set master