Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-31 19:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

mach: run rustup target add in ensure_bootstrapped

Browse source
This commit is contained in:
Simon Sapin 2020-01-02 14:20:20 +01:00
parent cef92a2050
commit e56e49e98f
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/build_commands.py
View file

@ -30,7 +30,7 @@ from mach.decorators import (
from mach.registrar import Registrar from mach.registrar import Registrar
from mach_bootstrap import _get_exec_path from mach_bootstrap import _get_exec_path
from servo.command_base import CommandBase, cd, call, check_call, BIN_SUFFIX, append_to_path_env, gstreamer_root from servo.command_base import CommandBase, cd, call, check_call, append_to_path_env, gstreamer_root
from servo.util import host_triple from servo.util import host_triple
@ -237,14 +237,6 @@ class MachCommands(CommandBase):
if very_verbose: if very_verbose:
opts += ["-vv"] opts += ["-vv"]
if target:
if self.config["tools"]["use-rustup"] and not uwp:
# 'rustup target add' fails if the toolchain is not installed at all.
self.call_rustup_run(["rustc", "--version"])
check_call(["rustup" + BIN_SUFFIX, "target", "add",
"--toolchain", self.rust_toolchain(), target])
env = self.build_env(target=target, is_build=True, uwp=uwp, features=features) env = self.build_env(target=target, is_build=True, uwp=uwp, features=features)
self.ensure_bootstrapped(target=target) self.ensure_bootstrapped(target=target)
self.ensure_clobbered() self.ensure_clobbered()

9
python/servo/command_base.py
View file

@ -1016,6 +1016,15 @@ install them, let us know by filing a bug!")
if "msvc" in target_platform: if "msvc" in target_platform:
Registrar.dispatch("bootstrap", context=self.context) Registrar.dispatch("bootstrap", context=self.context)
if target:
if self.config["tools"]["use-rustup"] and not "uwp" in target:
# 'rustup target add' fails if the toolchain is not installed at all.
self.call_rustup_run(["rustc", "--version"])
check_call(["rustup" + BIN_SUFFIX, "target", "add",
"--toolchain", self.rust_toolchain(), target])
self.context.bootstrapped = True self.context.bootstrapped = True
def ensure_clobbered(self, target_dir=None): def ensure_clobbered(self, target_dir=None):

2
python/servo/devenv_commands.py
View file

@ -49,7 +49,7 @@ class MachCommands(CommandBase):
features += self.pick_media_stack(media_stack, target) features += self.pick_media_stack(media_stack, target)
self.ensure_bootstrapped() self.ensure_bootstrapped(target=target)
self.ensure_clobbered() self.ensure_clobbered()
env = self.build_env() env = self.build_env()

2
python/servo/post_build_commands.py
View file

@ -241,13 +241,13 @@ class PostBuildCommands(CommandBase):
@CommandBase.build_like_command_arguments @CommandBase.build_like_command_arguments
def doc(self, params, features, target=None, android=False, magicleap=False, def doc(self, params, features, target=None, android=False, magicleap=False,
media_stack=None, **kwargs): media_stack=None, **kwargs):
self.ensure_bootstrapped()
rustc_path = check_output( rustc_path = check_output(
["rustup" + BIN_SUFFIX, "which", "--toolchain", self.rust_toolchain(), "rustc"]) ["rustup" + BIN_SUFFIX, "which", "--toolchain", self.rust_toolchain(), "rustc"])
assert path.basename(path.dirname(rustc_path)) == "bin" assert path.basename(path.dirname(rustc_path)) == "bin"
toolchain_path = path.dirname(path.dirname(rustc_path)) toolchain_path = path.dirname(path.dirname(rustc_path))
rust_docs = path.join(toolchain_path, "share", "doc", "rust", "html") rust_docs = path.join(toolchain_path, "share", "doc", "rust", "html")
self.ensure_bootstrapped()
docs = path.join(self.get_target_dir(), "doc") docs = path.join(self.get_target_dir(), "doc")
if not path.exists(docs): if not path.exists(docs):
os.makedirs(docs) os.makedirs(docs)