From 1ddd2b4cbe8f7fc055578beb874589cd3abda4e5 Mon Sep 17 00:00:00 2001 From: Elad Lahav Date: Sat, 8 Aug 2020 07:04:09 -0400 Subject: Use uname -p to detect x86_64 on QNX. --- mesonbuild/environment.py | 2 +- mesonbuild/mesonlib.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 6987863c0..da2d513e6 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -337,7 +337,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: """ if mesonlib.is_windows(): trial = detect_windows_arch(compilers) - elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd(): + elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd() or mesonlib.is_qnx(): trial = platform.processor().lower() else: trial = platform.machine().lower() diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index 2c563e487..4b8cce8fd 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -527,6 +527,8 @@ def is_irix() -> bool: def is_hurd() -> bool: return platform.system().lower() == 'gnu' +def is_qnx() -> bool: + return platform.system().lower() == 'qnx' def exe_exists(arglist: T.List[str]) -> bool: try: -- cgit v1.2.3