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/post_build_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/post_build_commands.py')
| -rw-r--r-- | python/servo/post_build_commands.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index a6ab4de647c..0311350e273 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -241,14 +241,13 @@ class PostBuildCommands(CommandBase): @CommandBase.build_like_command_arguments def doc(self, params, features, target=None, android=False, magicleap=False, media_stack=None, **kwargs): - env = os.environ.copy() - env["RUSTUP_TOOLCHAIN"] = self.toolchain() - rustc_path = check_output(["rustup" + BIN_SUFFIX, "which", "rustc"], env=env) + self.ensure_bootstrapped(rustup_components=["rust-docs"]) + rustc_path = check_output( + ["rustup" + BIN_SUFFIX, "which", "--toolchain", self.rust_toolchain(), "rustc"]) assert path.basename(path.dirname(rustc_path)) == "bin" toolchain_path = path.dirname(path.dirname(rustc_path)) rust_docs = path.join(toolchain_path, "share", "doc", "rust", "html") - self.ensure_bootstrapped() docs = path.join(self.get_target_dir(), "doc") if not path.exists(docs): os.makedirs(docs) |