diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-03-24 08:20:15 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-29 20:54:12 +0300 |
| commit | 8bdc5c2dd564fc685e82f67480ad0adc43c823b2 (patch) | |
| tree | f8fb2c3378c47123f53e38fa79941bec52333b03 | |
| parent | 7005e211a2aaf05626752c0c73d2518d8034911b (diff) | |
| download | meson-8bdc5c2dd564fc685e82f67480ad0adc43c823b2.zip meson-8bdc5c2dd564fc685e82f67480ad0adc43c823b2.tar.gz meson-8bdc5c2dd564fc685e82f67480ad0adc43c823b2.tar.bz2 | |
environment: "power machintosh" is ppc
I've combined the two ppc checks into one, since they're not very
complicated and added power machintosh, which is used by PPC macs
running older versions of osx.
Fixes: #6746
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index c8d960b..11bc76c 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -336,9 +336,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'arm' elif trial.startswith(('powerpc64', 'ppc64')): trial = 'ppc64' - elif trial.startswith(('powerpc', 'ppc')): - trial = 'ppc' - elif trial == 'macppc': + elif trial.startswith(('powerpc', 'ppc')) or trial in {'macppc', 'power machintosh'}: trial = 'ppc' elif trial in ('amd64', 'x64', 'i86pc'): trial = 'x86_64' @@ -790,7 +788,7 @@ class Environment: return LLVMDynamicLinker( compiler, for_machine, comp_class.LINKER_PREFIX, override, version=search_version(o)) - + if value is not None and invoked_directly: compiler = value # We've already hanedled the non-direct case above |