diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2020-01-02 14:21:58 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2020-01-02 15:30:33 +0100 |
| commit | d4da65d1497d6567415573117f7e0151e5c16050 (patch) | |
| tree | a6cd195aafe08efddbc82968be4f677a6588dd08 /python/servo/command_base.py | |
| parent | e56e49e98fe4f0056c4f7915d9de6e998c056624 (diff) | |
| download | servo-d4da65d1497d6567415573117f7e0151e5c16050.tar.gz servo-d4da65d1497d6567415573117f7e0151e5c16050.zip | |
mach: on Windows, opt into MSVC target for all uses of `rust_toolchain()`
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index e1edecd957a..283a741aee3 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -352,6 +352,10 @@ class CommandBase(object): filename = path.join(self.context.topdir, "rust-toolchain") with open(filename) as f: self._rust_toolchain = f.read().strip() + + if platform.system() == "Windows": + self._rust_toolchain += "-x86_64-pc-windows-msvc" + return self._rust_toolchain def call_rustup_run(self, args, **kwargs): @@ -370,10 +374,7 @@ class CommandBase(object): 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 - toolchain = self.rust_toolchain() - if platform.system() == "Windows": - toolchain += "-x86_64-pc-windows-msvc" - args = ["rustup" + BIN_SUFFIX, "run", "--install", toolchain] + args + args = ["rustup" + BIN_SUFFIX, "run", "--install", self.rust_toolchain()] + args else: args[0] += BIN_SUFFIX return call(args, **kwargs) |