RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-10 14:36:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gn build: Unbreak get.py and gn.py on Windows

Browse Source 
`os.uname()` doesn't exist on Windows, so use `platform.machine()` which
returns `os.uname()[4]` on non-Win and (on 64-bit systems) "AMD64" on Windows.
Also use `sys.platform` instead of `platform` to check for Windows-ness for the
file extension in gn.py (get.py got this right).

Differential Revision: https://reviews.llvm.org/D59115

llvm-svn: 355693
This commit is contained in:
Nico Weber 2019-03-08 12:45:50 +00:00
parent 65f76db954
commit 6e56add3ce
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/gn/get.py
View File

@ -33,7 +33,8 @@ def set_executable_bit(path):
def get_platform():
if os.uname()[4] != 'x86_64':
import platform
if platform.machine() not in ('AMD64', 'x86_64'):
return None
if sys.platform.startswith('linux'):
return 'linux-amd64'

5
utils/gn/gn.py
View File

@ -16,7 +16,8 @@ ROOT_DIR = os.path.join(THIS_DIR, '..', '..', '..')
def get_platform():
if os.uname()[4] != 'x86_64':
import platform
if platform.machine() not in ('AMD64', 'x86_64'):
return None
if sys.platform.startswith('linux'):
return 'linux-amd64'
@ -46,7 +47,7 @@ def main():
if not platform:
return print_no_gn(mention_get=False)
gn = os.path.join(os.path.dirname(__file__), 'bin', platform, 'gn')
if not os.path.exists(gn + ('.exe' if platform == 'windows' else '')):
if not os.path.exists(gn + ('.exe' if sys.platform == 'win32' else '')):
return print_no_gn(mention_get=True)
# Compute --dotfile= and --root= args to add.