diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-02-01 13:29:37 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-02-01 10:28:37 +0000 |
| commit | 79c087bad2f31f66da24169136c77b744ce4a453 (patch) | |
| tree | 2610aa83dd3b01078c565cccccfdc9bc697f9ea3 /mesonbuild/mesonlib.py | |
| parent | 8a7537ce2469d755e471edc532740df07a0f8e45 (diff) | |
| download | meson-79c087bad2f31f66da24169136c77b744ce4a453.zip meson-79c087bad2f31f66da24169136c77b744ce4a453.tar.gz meson-79c087bad2f31f66da24169136c77b744ce4a453.tar.bz2 | |
macos: lipo outputs aarch64 as arm64, fix it
Or we'll reject arm64 objects as invalid when building for aarch64
Diffstat (limited to 'mesonbuild/mesonlib.py')
| -rw-r--r-- | mesonbuild/mesonlib.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index 939b4cb..540fcdc 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -475,6 +475,7 @@ def darwin_get_object_archs(objpath): stdo = stdo.rsplit(': ', 1)[1] # Convert from lipo-style archs to meson-style CPUs stdo = stdo.replace('i386', 'x86') + stdo = stdo.replace('arm64', 'aarch64') # Add generic name for armv7 and armv7s if 'armv7' in stdo: stdo += ' arm' |