Skip to content

Commit

Permalink
Use uname -p to detect x86_64 on QNX.
Browse files Browse the repository at this point in the history
  • Loading branch information
Elad Lahav authored and dcbaker committed Aug 8, 2020
1 parent 91c5b37 commit 1ddd2b4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion mesonbuild/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 2 additions & 0 deletions mesonbuild/mesonlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 1ddd2b4

Please sign in to comment.