diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-01-03 19:08:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-03 19:08:08 -0500 |
| commit | de50b4142b364f76d50f2bc43d4db030450bfdce (patch) | |
| tree | 3c5cac53e386c2749e5f24a4fd5150ef00ecd593 /python/servo/devenv_commands.py | |
| parent | 2488213d18d5bc9806b41fb2756a2a82dbe933a4 (diff) | |
| parent | 8fc072a375378dcc73d2e348d8e46a4d735e6210 (diff) | |
| download | servo-de50b4142b364f76d50f2bc43d4db030450bfdce.tar.gz servo-de50b4142b364f76d50f2bc43d4db030450bfdce.zip | |
Auto merge of #25417 - servo:profile, r=jdm,Manishearth
mach: automatically use the 'minimal' rustup profile + rustc-dev component
Fixes https://github.com/servo/servo/issues/25401
Fixes https://github.com/servo/servo/issues/25402
Diffstat (limited to 'python/servo/devenv_commands.py')
| -rw-r--r-- | python/servo/devenv_commands.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index 45a3f946f38..bc715205523 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -24,7 +24,7 @@ from mach.decorators import ( Command, ) -from servo.command_base import CommandBase, cd, call, BIN_SUFFIX +from servo.command_base import CommandBase, cd, call from servo.build_commands import notify_build_done from servo.util import get_static_rust_lang_org_dist, get_urlopen_kwargs @@ -49,7 +49,7 @@ class MachCommands(CommandBase): features += self.pick_media_stack(media_stack, target) - self.ensure_bootstrapped() + self.ensure_bootstrapped(target=target) self.ensure_clobbered() env = self.build_env() @@ -213,7 +213,7 @@ class MachCommands(CommandBase): filename = path.join(self.context.topdir, "rust-toolchain") with open(filename, "w") as f: f.write(toolchain + "\n") - return call(["rustup" + BIN_SUFFIX, "component", "add", "rustc-dev"]) + self.ensure_bootstrapped() @Command('fetch', description='Fetch Rust, Cargo and Cargo dependencies', |