aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorElad Lahav <elahav@qnx.com>2020-08-08 07:04:09 -0400
committerDylan Baker <dylan@pnwbakers.com>2020-08-08 15:43:57 -0700
commit1ddd2b4cbe8f7fc055578beb874589cd3abda4e5 (patch)
tree455979aeb63ee8a5b22c38880f15ccf43dc0d170 /mesonbuild
parent91c5b379706633f4e5a480dbcea4844a9f54be79 (diff)
downloadmeson-1ddd2b4cbe8f7fc055578beb874589cd3abda4e5.zip
meson-1ddd2b4cbe8f7fc055578beb874589cd3abda4e5.tar.gz
meson-1ddd2b4cbe8f7fc055578beb874589cd3abda4e5.tar.bz2
Use uname -p to detect x86_64 on QNX.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/environment.py2
-rw-r--r--mesonbuild/mesonlib.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 6987863..da2d513 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 2c563e4..4b8cce8 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: