From a94b94cab054330a60b8d64396ac3d57d5f270c8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 11 Mar 2021 13:03:45 +0530 Subject: [PATCH] Fix macos-freeze building everything twice --- setup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 1b21c39ef..b202fc62d 100755 --- a/setup.py +++ b/setup.py @@ -563,6 +563,7 @@ class CompilationDatabase: queue.append(Command(desc, cmd, is_newer_func, on_success or no_op, key, keyfile)) def build_all(self) -> None: + def sort_key(compile_cmd: Command) -> int: if compile_cmd.keyfile: return os.path.getsize(compile_cmd.keyfile) @@ -753,8 +754,9 @@ def init_env_from_args(args: Options, native_optimizations: bool = False) -> Non ) -def build(args: Options, native_optimizations: bool = True) -> None: - init_env_from_args(args, native_optimizations) +def build(args: Options, native_optimizations: bool = True, call_init: bool = True) -> None: + if call_init: + init_env_from_args(args, native_optimizations) sources, headers = find_c_files() compile_c_extension( kitty_env(), 'kitty/fast_data_types', args.compilation_database, sources, headers @@ -1269,8 +1271,9 @@ def main() -> None: build(args, native_optimizations=False) package(args, bundle_type='linux-freeze') elif args.action == 'macos-freeze': - build(args, native_optimizations=False) + init_env_from_args(args, native_optimizations=False) build_launcher(args, launcher_dir=launcher_dir) + build(args, native_optimizations=False, call_init=False) package(args, bundle_type='macos-freeze') elif args.action == 'kitty.app': args.prefix = 'kitty.app'