aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-01-10 22:59:24 +0200
committerGitHub <noreply@github.com>2019-01-10 22:59:24 +0200
commite5b1cf5088d22b906c50955bc14fa5cb01238f86 (patch)
treea708e36f5867668005ddb8df7ecbf68b9cbd5a04
parent17a602a4ec7187db4c80ecb2a1f137dc86717ea0 (diff)
parent198de0de5d00e8dc77de717face58d9eebaf1539 (diff)
downloadmeson-e5b1cf5088d22b906c50955bc14fa5cb01238f86.zip
meson-e5b1cf5088d22b906c50955bc14fa5cb01238f86.tar.gz
meson-e5b1cf5088d22b906c50955bc14fa5cb01238f86.tar.bz2
Merge pull request #4746 from mesonbuild/parisc64
Report parisc64 as parisc. Closes #4714.
-rw-r--r--mesonbuild/environment.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index e99174c..f287cb0 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -246,6 +246,10 @@ def detect_cpu_family(compilers):
trial = 'arm'
# Add more quirks here as bugs are reported. Keep in sync with detect_cpu()
# below.
+ elif trial == 'parisc64':
+ # ATM there is no 64 bit userland for PA-RISC. Thus always
+ # report it as 32 bit for simplicity.
+ trial = 'parisc'
if trial not in known_cpu_families:
mlog.warning('Unknown CPU family {!r}, please report this at '