Skip to content

Commit 4820cc8

Browse files
author
Michal Klocek
committed
Make gn fat
Support universal/fat builds of gn. Add 'osx-architectures' list option and corresponding compile and link arguments, avoid however calling 'lipo' as it is not required in our case. Task-number: QTBUG-126317 Change-Id: I26fc5f759825b813c79a71b9ecf47d9585a4375e Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/584467 Reviewed-by: Allan Sandfeld Jensen <[email protected]>
1 parent c091eb3 commit 4820cc8

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

gn/build/gen.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ def main(argv):
212212
help='The path to the macOS SDK sysroot to be used.')
213213
args_list.add('--qt-version',
214214
help="The qt version gn is compiled for.")
215+
args_list.add('--osx-architectures',
216+
help='delimited list of architectures for universal build',
217+
type=str)
215218

216219
if sys.platform == 'zos':
217220
args_list.add('--zoslib-dir',
@@ -566,6 +569,11 @@ def WriteGNNinja(path, platform, host, options, args_list):
566569
min_mac_version_flag = '-mmacosx-version-min=10.9'
567570
cflags.append(min_mac_version_flag)
568571
ldflags.append(min_mac_version_flag)
572+
if options.osx_architectures:
573+
arch_list = [str(arch) for arch in options.osx_architectures.split(',')]
574+
for arch in arch_list:
575+
cflags.extend(['-arch',arch])
576+
ldflags.extend(['-arch',arch])
569577
elif platform.is_aix():
570578
cflags.append('-maix64')
571579
ldflags.append('-maix64')

0 commit comments

Comments
 (0)