KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix launcher not building universal

Browse Source
This commit is contained in:
Kovid Goyal 2022-07-21 10:54:21 +05:30
parent e0ce0a67cc
commit a01dbbdf04
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup.py
View File

@ -822,8 +822,6 @@ def safe_makedirs(path: str) -> None:
def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
werror = '' if args.ignore_compiler_warnings else '-pedantic-errors -Werror' werror = '' if args.ignore_compiler_warnings else '-pedantic-errors -Werror'
cflags = f'-Wall {werror} -fpie'.split() cflags = f'-Wall {werror} -fpie'.split()
if args.build_universal_binary:
cflags += '-arch x86_64 -arch arm64'.split()
cppflags = [] cppflags = []
libs: List[str] = [] libs: List[str] = []
ldflags = shlex.split(os.environ.get('LDFLAGS', '')) ldflags = shlex.split(os.environ.get('LDFLAGS', ''))
@ -860,6 +858,9 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's
cflags += shlex.split(os.environ.get('CFLAGS', '')) cflags += shlex.split(os.environ.get('CFLAGS', ''))
for path in args.extra_include_dirs: for path in args.extra_include_dirs:
cflags.append(f'-I{path}') cflags.append(f'-I{path}')
if args.build_universal_binary:
set_arches(cflags)
set_arches(ldflags)
if bundle_type == 'linux-freeze': if bundle_type == 'linux-freeze':
# --disable-new-dtags prevents -rpath from generating RUNPATH instead of # --disable-new-dtags prevents -rpath from generating RUNPATH instead of
# RPATH entries in the launcher. The ld dynamic linker does not search # RPATH entries in the launcher. The ld dynamic linker does not search