Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #14303 - upsuper:triple-msvc, r=bholley

Browse source 
Use msvc toolchain when in Visual Studio env

<!-- Please describe your changes on the following line: -->

r? @bholley

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14303)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-21 23:00:35 -06:00 • committed by GitHub
commit e97804986a
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/command_base.py
View file

@ -107,7 +107,8 @@ def host_triple():
elif os_type == "android": elif os_type == "android":
os_type = "linux-androideabi" os_type = "linux-androideabi"
elif os_type == "windows": elif os_type == "windows":
if os.getenv("MSYSTEM") is None: # If we are in a Visual Studio environment, use msvc
if os.getenv("VSInstallDir") is not None:
os_type = "pc-windows-msvc" os_type = "pc-windows-msvc"
else: else:
os_type = "pc-windows-gnu" os_type = "pc-windows-gnu"