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

Auto merge of #9624 - Jayflux:hotfix/9597, r=KiChjang

Browse source 
use python's built in platform module for detection, for more accurac…

…y and cross platform support
Fixes #9597.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9624)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-13 19:44:03 +05:30
commit 80e55c7ce4
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/servo/command_base.py
View file

@ -13,6 +13,8 @@ import contextlib
import subprocess import subprocess
from subprocess import PIPE from subprocess import PIPE
import sys import sys
import platform
import toml import toml
from mach.registrar import Registrar from mach.registrar import Registrar
@ -32,7 +34,7 @@ def cd(new_path):
def host_triple(): def host_triple():
os_type = subprocess.check_output(["uname", "-s"]).strip().lower() os_type = platform.system().lower()
if os_type == "linux": if os_type == "linux":
os_type = "unknown-linux-gnu" os_type = "unknown-linux-gnu"
elif os_type == "darwin": elif os_type == "darwin":
@ -44,7 +46,7 @@ def host_triple():
else: else:
os_type = "unknown" os_type = "unknown"
cpu_type = subprocess.check_output(["uname", "-m"]).strip().lower() cpu_type = platform.machine().lower()
if cpu_type in ["i386", "i486", "i686", "i768", "x86"]: if cpu_type in ["i386", "i486", "i686", "i768", "x86"]:
cpu_type = "i686" cpu_type = "i686"
elif cpu_type in ["x86_64", "x86-64", "x64", "amd64"]: elif cpu_type in ["x86_64", "x86-64", "x64", "amd64"]: