diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-08-30 10:41:12 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-08-30 10:41:12 -0700 |
| commit | f073c3cfe16a81afbf31e85fd08603a8044c3ef1 (patch) | |
| tree | 73d5a8eb82174124670d03890926e7730621f9b1 | |
| parent | 78f8a286d06eb31f361d616098e59c0cfee2a911 (diff) | |
| download | meson-f073c3cfe16a81afbf31e85fd08603a8044c3ef1.zip meson-f073c3cfe16a81afbf31e85fd08603a8044c3ef1.tar.gz meson-f073c3cfe16a81afbf31e85fd08603a8044c3ef1.tar.bz2 | |
environment: correctly handle cpu value aarch64_be
Fixes #9191
| -rw-r--r-- | mesonbuild/environment.py | 8 | ||||
| -rw-r--r-- | unittests/internaltests.py | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 3ad150d..a509087 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -314,6 +314,9 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'x86' elif trial == 'arm64': trial = 'aarch64' + elif trial.startswith('aarch64'): + # This can be `aarch64_be` + trial = 'aarch64' elif trial.startswith('arm') or trial.startswith('earm'): trial = 'arm' elif trial.startswith(('powerpc64', 'ppc64')): @@ -373,10 +376,13 @@ def detect_cpu(compilers: CompilersDict) -> str: # Same check as above for cpu_family if any_compiler_has_define(compilers, '__i386__'): trial = 'i686' # All 64 bit cpus have at least this level of x86 support. - elif trial == 'aarch64': + elif trial.startswith('aarch64'): # Same check as above for cpu_family if any_compiler_has_define(compilers, '__arm__'): trial = 'arm' + else: + # for aarch64_be + trial = 'aarch64' elif trial.startswith('earm'): trial = 'arm' elif trial == 'e2k': diff --git a/unittests/internaltests.py b/unittests/internaltests.py index de2badb..07643ed 100644 --- a/unittests/internaltests.py +++ b/unittests/internaltests.py @@ -1465,6 +1465,8 @@ class InternalTests(unittest.TestCase): ('amd64', 'x86_64'), ('x64', 'x86_64'), ('i86pc', 'x86_64'), # Solaris + ('aarch64', 'aarch64'), + ('aarch64_be', 'aarch64'), ] with mock.patch('mesonbuild.environment.any_compiler_has_define', mock.Mock(return_value=False)): @@ -1500,6 +1502,8 @@ class InternalTests(unittest.TestCase): ('mips64', 'mips64'), ('mips', 'mips'), ('mipsel', 'mips'), + ('aarch64', 'aarch64'), + ('aarch64_be', 'aarch64'), ] with mock.patch('mesonbuild.environment.any_compiler_has_define', mock.Mock(return_value=False)): |