diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-01-30 15:30:36 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-01-31 20:36:49 +0000 |
| commit | b5f6be6733e9a9e4e8d9c1309be84f6f87840034 (patch) | |
| tree | 3a2ad783b5d03e2608e6232cf7e1d03d7d08161f /mesonbuild/mesonlib.py | |
| parent | 50b863032ed3913b9737112b5250c2d35a7b9fb7 (diff) | |
| download | meson-b5f6be6733e9a9e4e8d9c1309be84f6f87840034.zip meson-b5f6be6733e9a9e4e8d9c1309be84f6f87840034.tar.gz meson-b5f6be6733e9a9e4e8d9c1309be84f6f87840034.tar.bz2 | |
macos: lipo from older xcode does not support -archs
Diffstat (limited to 'mesonbuild/mesonlib.py')
| -rw-r--r-- | mesonbuild/mesonlib.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index 09228dc..939b4cb 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -468,10 +468,11 @@ def darwin_get_object_archs(objpath): to fetch the list of archs supported by it. Supports both thin objects and 'fat' objects. ''' - _, stdo, stderr = Popen_safe(['lipo', '-archs', objpath]) + _, stdo, stderr = Popen_safe(['lipo', '-info', objpath]) if not stdo: mlog.debug('lipo {}: {}'.format(objpath, stderr)) return None + stdo = stdo.rsplit(': ', 1)[1] # Convert from lipo-style archs to meson-style CPUs stdo = stdo.replace('i386', 'x86') # Add generic name for armv7 and armv7s |