Skip to content

Commit

Permalink
environment: Correctly detect arm64 as aarch64
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ePirat authored and jpakkane committed Jul 2, 2020
1 parent a296ee4 commit 85686e2
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions mesonbuild/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')):
Expand Down

0 comments on commit 85686e2

Please sign in to comment.