aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-08-04 06:25:53 +0000
committerJussi Pakkanen <jpakkane@gmail.com>2019-08-04 21:47:44 +0300
commitddbf60f86da4ece3d407fe3b3e38ff45e34f561e (patch)
treeb3d6f2366fe65d0cbb0d15e95cf272160090a14d
parent147d3f752c4133f176408eba336b8e587fc98142 (diff)
downloadmeson-ddbf60f86da4ece3d407fe3b3e38ff45e34f561e.zip
meson-ddbf60f86da4ece3d407fe3b3e38ff45e34f561e.tar.gz
meson-ddbf60f86da4ece3d407fe3b3e38ff45e34f561e.tar.bz2
environment: simplify powerpc conditionals
-rw-r--r--mesonbuild/environment.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 1fca6fd..0d30adb 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -225,13 +225,11 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'x86'
elif trial.startswith('arm'):
trial = 'arm'
- elif trial.startswith('ppc64'):
+ elif trial.startswith(('powerpc64', 'ppc64')):
trial = 'ppc64'
- elif trial == 'macppc':
+ elif trial.startswith(('powerpc', 'ppc')):
trial = 'ppc'
- elif trial == 'powerpc64':
- trial = 'ppc64'
- elif trial == 'powerpc':
+ elif trial == 'macppc':
trial = 'ppc'
elif trial in ('amd64', 'x64', 'i86pc'):
trial = 'x86_64'