From 21a1afeea9596b727a8493de8c4260a2b876581e Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 8 Mar 2019 12:45:50 +0000 Subject: [PATCH] gn build: Unbreak get.py and gn.py on Windows `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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355693 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/gn/get.py | 3 ++- utils/gn/gn.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/gn/get.py b/utils/gn/get.py index defeac98f2c..4015d5986c9 100755 --- a/utils/gn/get.py +++ b/utils/gn/get.py @@ -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' diff --git a/utils/gn/gn.py b/utils/gn/gn.py index 73f2c80fe9d..62cbaa91e07 100755 --- a/utils/gn/gn.py +++ b/utils/gn/gn.py @@ -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. -- 2.50.1