--- mesonbuild/environment.py.orig	2020-08-16 02:27:05.000000000 +1000
+++ mesonbuild/environment.py	2020-08-26 19:05:13.919226000 +1000
@@ -333,7 +333,7 @@
     """
     if mesonlib.is_windows():
         trial = detect_windows_arch(compilers)
-    elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd() or mesonlib.is_qnx():
+    elif mesonlib.is_bsdsunix() or mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd() or mesonlib.is_qnx():
         trial = platform.processor().lower()
     else:
         trial = platform.machine().lower()
@@ -384,7 +384,7 @@
 def detect_cpu(compilers: CompilersDict):
     if mesonlib.is_windows():
         trial = detect_windows_arch(compilers)
-    elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd():
+    elif mesonlib.is_bsdsunix() or mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd():
         trial = platform.processor().lower()
     else:
         trial = platform.machine().lower()