From 69efd086f51efa7616b9fd699c6f6e93f2fbfd77 Mon Sep 17 00:00:00 2001 From: tigercosmos Date: Sat, 19 Aug 2017 02:29:21 +0800 Subject: [PATCH] fix windows build issue --- python/servo/util.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/python/servo/util.py b/python/servo/util.py index ad55d6b3f79..b6b7ab25b7e 100644 --- a/python/servo/util.py +++ b/python/servo/util.py @@ -37,11 +37,7 @@ def host_platform(): elif os_type == "android": os_type = "linux-androideabi" elif os_type == "windows": - # If we are in a Visual Studio environment, use msvc - if os.getenv("PLATFORM") is not None: - os_type = "pc-windows-msvc" - else: - os_type = "unknown" + os_type = "pc-windows-msvc" elif os_type == "freebsd": os_type = "unknown-freebsd" else: @@ -52,16 +48,7 @@ def host_platform(): def host_triple(): os_type = host_platform() cpu_type = platform.machine().lower() - if os_type.endswith("-msvc"): - # vcvars*.bat should set it properly - platform_env = os.environ.get("PLATFORM").upper() - if platform_env == "X86": - cpu_type = "i686" - elif platform_env == "X64": - cpu_type = "x86_64" - else: - cpu_type = "unknown" - elif cpu_type in ["i386", "i486", "i686", "i768", "x86"]: + if cpu_type in ["i386", "i486", "i686", "i768", "x86"]: cpu_type = "i686" elif cpu_type in ["x86_64", "x86-64", "x64", "amd64"]: cpu_type = "x86_64"