diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2017-08-01 04:03:36 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-19 00:04:17 +0300 |
| commit | a35844c08d8d30e21920c4881ce2f859961c5a0d (patch) | |
| tree | 83b60f40559fd5985128ed5759b82a4764f12b81 | |
| parent | ceb70a5c2ec966f09ed02db9d47a015ee69adaab (diff) | |
| download | meson-a35844c08d8d30e21920c4881ce2f859961c5a0d.zip meson-a35844c08d8d30e21920c4881ce2f859961c5a0d.tar.gz meson-a35844c08d8d30e21920c4881ce2f859961c5a0d.tar.bz2 | |
Canonicalize 'i86pc' return from platform.machine() for Solaris
i86pc may be either 32-bit or 64-bit, so use existing compiler checks
to determine if it should return 'x86' or 'x86_64'.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 84a7596..744d49d 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -242,7 +242,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'ppc64' if 'powerpc64' in stdo: trial = 'ppc64' - elif trial in ('amd64', 'x64'): + elif trial in ('amd64', 'x64', 'i86pc'): trial = 'x86_64' # On Linux (and maybe others) there can be any mixture of 32/64 bit code in @@ -273,7 +273,7 @@ def detect_cpu(compilers: CompilersDict): trial = detect_windows_arch(compilers) else: trial = platform.machine().lower() - if trial in ('amd64', 'x64'): + if trial in ('amd64', 'x64', 'i86pc'): trial = 'x86_64' if trial == 'x86_64': # Same check as above for cpu_family |