diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2020-01-02 15:27:25 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2020-01-02 15:48:11 +0100 |
| commit | 1110cac184d15ba24f8f94cb21e258de4ba5be76 (patch) | |
| tree | e2f448a2d4adee0676484059b6da33c49d7360aa /python/servo/command_base.py | |
| parent | 6f70a9c1de649ce38e014eaa8fa3b22f862768a9 (diff) | |
| download | servo-1110cac184d15ba24f8f94cb21e258de4ba5be76.tar.gz servo-1110cac184d15ba24f8f94cb21e258de4ba5be76.zip | |
mach + rustup: use the minimal profile and install rustc-dev
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index f8c1bcb0610..f42a36fc738 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -1009,7 +1009,12 @@ install them, let us know by filing a bug!") toolchain = self.rust_toolchain() if toolchain not in check_output(["rustup", "toolchain", "list"]): - check_call(["rustup", "toolchain", "install", toolchain]) + check_call(["rustup", "toolchain", "install", "--profile", "minimal", toolchain]) + + if "rustc-dev" not in check_output( + ["rustup", "component", "list", "--installed", "--toolchain", toolchain] + ): + check_call(["rustup", "component", "add", "--toolchain", toolchain, "rustc-dev"]) if target and "uwp" not in target and target not in check_output( ["rustup", "target", "list", "--installed", "--toolchain", toolchain] @@ -1029,7 +1034,7 @@ install them, let us know by filing a bug!") return 1 raise version = tuple(map(int, re.match(b"rustup (\d+)\.(\d+)\.(\d+)", version_line).groups())) - if version < (1, 11, 0): + if version < (1, 21, 0): print("rustup is at version %s.%s.%s, Servo requires 1.11.0 or more recent." % version) print("Try running 'rustup self update'.") return 1 |