From 9f5ba0aee936e5be417c51f6e12c0d96a009c76b Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 5 Apr 2017 21:52:10 +0200 Subject: [PATCH] Make `./mach rustc` and `./mach cargo` bootstrap. --- python/servo/devenv_commands.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index 8fde8e3b361..56f02b1cb55 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -33,6 +33,8 @@ class MachCommands(CommandBase): if not params: params = [] + self.ensure_bootstrapped() + if self.context.topdir == getcwd(): with cd(path.join('components', 'servo')): return call(["cargo"] + params, env=self.build_env()) @@ -49,6 +51,7 @@ class MachCommands(CommandBase): params = [] self.set_use_stable_rust() + self.ensure_bootstrapped() env = self.build_env(geckolib=True) if self.context.topdir == getcwd(): @@ -113,6 +116,9 @@ class MachCommands(CommandBase): def rustc(self, params): if params is None: params = [] + + self.ensure_bootstrapped() + return call(["rustc"] + params, env=self.build_env()) @Command('rustc-geckolib', @@ -126,6 +132,7 @@ class MachCommands(CommandBase): params = [] self.set_use_stable_rust() + self.ensure_bootstrapped() env = self.build_env(geckolib=True) return call(["rustc"] + params, env=env)