aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-08-30 10:38:47 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-08-30 10:38:47 -0700
commit78f8a286d06eb31f361d616098e59c0cfee2a911 (patch)
tree063717ba9e244ec0e4b95971e3dab35d02f89578 /mesonbuild/environment.py
parentb8cdae70033843e054ab6580fdeec1c08693c645 (diff)
downloadmeson-78f8a286d06eb31f361d616098e59c0cfee2a911.zip
meson-78f8a286d06eb31f361d616098e59c0cfee2a911.tar.gz
meson-78f8a286d06eb31f361d616098e59c0cfee2a911.tar.bz2
environment: add ppc -> ppc64 for aix to detect_cpu
This seems like an oversight, that we'd replace ppc with ppc64 on AIX for the cpu_family, but not for the specific cpu.
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 5a9a587..3ad150d 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -387,6 +387,10 @@ def detect_cpu(compilers: CompilersDict) -> str:
trial = 'mips'
else:
trial = 'mips64'
+ elif trial == 'ppc':
+ # AIX always returns powerpc, check here for 64-bit
+ if any_compiler_has_define(compilers, '__64BIT__'):
+ trial = 'ppc64'
# Add more quirks here as bugs are reported. Keep in sync with
# detect_cpu_family() above.