aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@openbsd.org>2019-01-13 11:18:32 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2019-01-13 14:23:16 +0200
commite02b79dc1e2e154b26a4dd6d4fff324d803b92ed (patch)
tree612ea358a3ba6671bfc22af982403bb986175122 /mesonbuild/environment.py
parent680d2665917d7ca3d17ee5ab0cafd40a5faa4138 (diff)
downloadmeson-e02b79dc1e2e154b26a4dd6d4fff324d803b92ed.zip
meson-e02b79dc1e2e154b26a4dd6d4fff324d803b92ed.tar.gz
meson-e02b79dc1e2e154b26a4dd6d4fff324d803b92ed.tar.bz2
OpenBSD: register machine cpu "macppc" as cpu_family "ppc"
On OpenBSD, the main PowerPC machine is known as macppc, while the processor family is powerpc: $ uname -{m,p} macppc powerpc $ echo 'import platform; print (platform.machine())' | python3 macppc $ echo 'import platform; print (platform.processor())' | python3 powerpc This allows for e.g. GLib configure to properly detect that cpu: Build machine cpu family: ppc Build machine cpu: macppc While it failed before with: WARNING: Unknown CPU family 'macppc' <snip>
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 4bf77ac..26d3f15 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -220,6 +220,8 @@ def detect_cpu_family(compilers):
trial = 'arm'
elif trial.startswith('ppc64'):
trial = 'ppc64'
+ elif trial == 'macppc':
+ trial = 'ppc'
elif trial == 'powerpc':
trial = 'ppc'
# FreeBSD calls both ppc and ppc64 "powerpc".