From cfd62cf8dc0a99eb7af70580f2b47e03ac23da81 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 26 May 2020 13:01:49 +0200 Subject: 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 --- python/servo/command_base.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'python/servo/command_base.py') diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 104aa746b61..65619102a7d 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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]) -- cgit v1.2.3