diff options
| author | Marvin Scholz <epirat07@gmail.com> | 2020-07-02 11:21:57 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-07-02 20:03:24 +0300 |
| commit | 85686e21d78a587de64dc31b5f50a513ac4b585e (patch) | |
| tree | 926c07c61c27a16b4f4af6f8ee676f6703adeef1 | |
| parent | a296ee44a1d6bbf72c87bbb6f1063272e0cc24bf (diff) | |
| download | meson-85686e21d78a587de64dc31b5f50a513ac4b585e.zip meson-85686e21d78a587de64dc31b5f50a513ac4b585e.tar.gz meson-85686e21d78a587de64dc31b5f50a513ac4b585e.tar.bz2 | |
environment: Correctly detect arm64 as aarch64
On some systems aarch64 is reported as arm64. Due to mesons
mangling of everything that starts with arm, it would end up being
detected as arm (which implies 32 bit) which is incorrect.
| -rw-r--r-- | mesonbuild/environment.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index d1cbfe7..8083aa8 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -341,6 +341,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'x86' elif trial == 'bepc': trial = 'x86' + elif trial == 'arm64': + trial = 'aarch64' elif trial.startswith('arm') or trial.startswith('earm'): trial = 'arm' elif trial.startswith(('powerpc64', 'ppc64')): |