aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/util.py
diff options
context:
space:
mode:
authortigercosmos <b04209032@ntu.edu.tw>2017-08-19 02:29:21 +0800
committertigercosmos <b04209032@ntu.edu.tw>2017-08-19 02:29:21 +0800
commit69efd086f51efa7616b9fd699c6f6e93f2fbfd77 (patch)
tree201dab88447a901346d500b09c04eafeff863f7e /python/servo/util.py
parent0fcbcf7fc5b050f8749c25d4821d4b219e5b264f (diff)
downloadservo-69efd086f51efa7616b9fd699c6f6e93f2fbfd77.tar.gz
servo-69efd086f51efa7616b9fd699c6f6e93f2fbfd77.zip
fix windows build issue
Diffstat (limited to 'python/servo/util.py')
-rw-r--r--python/servo/util.py17
1 files 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"