servo: Merge #14303 - Use msvc toolchain when in Visual Studio env (from upsuper:triple-msvc); r=bholley

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

r? @bholley

Source-Repo: https://github.com/servo/servo
Source-Revision: e97804986ad259083981db7d4f7995d822d693b5
This commit is contained in:
Xidorn Quan 2016-11-21 23:00:35 -06:00
Родитель 174dbcace7
Коммит c2c884b3fc
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

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