Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-31 03:00:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26662 - servo:rustup, r=jdm

Browse source 
Partial preparations for upgrading to Rust nightly-2020-05-26

CC https://github.com/servo/servo/issues/26661
Fixes https://github.com/servo/servo/issues/26645
This commit is contained in:
bors-servo 2020-05-27 02:55:17 -04:00 • committed by GitHub
commit 34a41f57c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/servo/command_base.py
View file

@ -986,7 +986,13 @@ install them, let us know by filing a bug!")
installed = check_output(
["rustup", "component", "list", "--installed", "--toolchain", toolchain]
)
for component in set(rustup_components or []) | {"rustc-dev"}:
required_components = {
# For components/script_plugins, https://github.com/rust-lang/rust/pull/67469
"rustc-dev",
# https://github.com/rust-lang/rust/issues/72594#issuecomment-633779564
"llvm-tools-preview",
}
for component in set(rustup_components or []) | required_components:
if component.encode("utf-8") not in installed:
check_call(["rustup", "component", "add", "--toolchain", toolchain, component])