diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-12-19 18:05:10 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-01-10 18:05:46 +0100 |
| commit | 0681e682e999ed7ec7c7067ac1b788290544ceab (patch) | |
| tree | 9d29fd5323c622a5c015fb43d28f77bb54028f86 /python/servo/command_base.py | |
| parent | ded0bc93653dabd23c9fd4f2db17caa1074af841 (diff) | |
| download | servo-0681e682e999ed7ec7c7067ac1b788290544ceab.tar.gz servo-0681e682e999ed7ec7c7067ac1b788290544ceab.zip | |
rustup.rs: Use MSVC rather than GNU toolchains on Windows
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index c7d6f51d1f9..1f3d784ebc3 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -14,6 +14,7 @@ import itertools import locale import os from os import path +import platform import re import contextlib import subprocess @@ -337,7 +338,10 @@ class CommandBase(object): print "rustup is at version %s.%s.%s, Servo requires 1.8.0 or more recent." % version print "Try running 'rustup self update'." return 1 - args = ["rustup" + BIN_SUFFIX, "run", "--install", self.toolchain()] + args + toolchain = self.toolchain() + if platform.system() == "Windows": + toolchain += "-x86_64-pc-windows-msvc" + args = ["rustup" + BIN_SUFFIX, "run", "--install", toolchain] + args else: args[0] += BIN_SUFFIX return call(args, **kwargs) |