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

rustup.rs: Use MSVC rather than GNU toolchains on Windows

Browse source
This commit is contained in:
Simon Sapin 2017-12-19 18:05:10 +01:00
parent ded0bc9365
commit 0681e682e9
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/servo/command_base.py
View file

@ -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)