diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2020-05-26 13:01:49 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2020-05-26 21:11:23 +0200 |
| commit | cfd62cf8dc0a99eb7af70580f2b47e03ac23da81 (patch) | |
| tree | 122dce3adc2b3396a99c82229ef0b0441033147d /python/servo/command_base.py | |
| parent | f3313739f576cc5ca955e20743db524114a8f799 (diff) | |
| download | servo-cfd62cf8dc0a99eb7af70580f2b47e03ac23da81.tar.gz servo-cfd62cf8dc0a99eb7af70580f2b47e03ac23da81.zip | |
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
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 8 |
1 files changed, 7 insertions, 1 deletions
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]) |