From ddbf60f86da4ece3d407fe3b3e38ff45e34f561e Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 4 Aug 2019 06:25:53 +0000 Subject: [PATCH] environment: simplify powerpc conditionals --- mesonbuild/environment.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 1fca6fdeb..0d30adba3 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'