aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/command_base.py
diff options
context:
space:
mode:
authorJack Moffitt <jack@metajack.im>2016-11-02 21:11:43 -0600
committerJack Moffitt <jack@metajack.im>2016-11-16 10:38:15 -0700
commit8e8519d03826042b453e54527aaf3e3646221fec (patch)
tree3413460d9915e289267e9e9b5552ce52a95f7cf0 /python/servo/command_base.py
parent524ed827007dee1563aed25f3bc3d0edff77ea78 (diff)
downloadservo-8e8519d03826042b453e54527aaf3e3646221fec.tar.gz
servo-8e8519d03826042b453e54527aaf3e3646221fec.zip
Fix test-wpt and test-css for Windows.
In addition to minor changes for Windows, this forces Windows Python to be used for all Windows builds (instead of using Windows Python only for pc-windows-msvc builds).
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r--python/servo/command_base.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index c6ea363dd05..a67ea0b208d 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -107,7 +107,10 @@ def host_triple():
elif os_type == "android":
os_type = "linux-androideabi"
elif os_type == "windows":
- os_type = "pc-windows-msvc"
+ if os.getenv("MSYSTEM") is None:
+ os_type = "pc-windows-msvc"
+ else:
+ os_type = "pc-windows-gnu"
elif os_type.startswith("mingw64_nt-") or os_type.startswith("cygwin_nt-"):
os_type = "pc-windows-gnu"
elif os_type == "freebsd":