From 21a38841d021b217156835618007b267bb9bc9a5 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Wed, 9 Dec 2020 07:41:47 +0000 Subject: [PATCH] Simplify setup.{sh,bat} and work around rust-lang/rustup#2601. --- setup.bat | 5 ++++- setup.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/setup.bat b/setup.bat index c435d945d9..f1746169d8 100644 --- a/setup.bat +++ b/setup.bat @@ -1,3 +1,6 @@ setlocal -rustup toolchain install nightly-2020-11-24 --component rust-src rustc-dev llvm-tools-preview +rem HACK(eddyb) including `rust-std` works around this `rustup` bug: +rem https://github.com/rust-lang/rustup/issues/2601 + +rustup component add rust-std rust-src rustc-dev llvm-tools-preview diff --git a/setup.sh b/setup.sh index 40550e2069..cc182892ca 100755 --- a/setup.sh +++ b/setup.sh @@ -1,3 +1,6 @@ #!/usr/bin/env bash -rustup toolchain install nightly-2020-11-24 --component rust-src rustc-dev llvm-tools-preview +# HACK(eddyb) including `rust-std` works around this `rustup` bug: +# https://github.com/rust-lang/rustup/issues/2601 + +rustup component add rust-std rust-src rustc-dev llvm-tools-preview