From 65b38f80fbc834808083ef95abaad2c4df2134ad Mon Sep 17 00:00:00 2001 From: renaud gaudin Date: Tue, 7 Nov 2023 14:00:06 +0000 Subject: [PATCH] disabled bitcode support, as deprecated since xcode14 See https://stackoverflow.com/questions/72543728/xcode-14-deprecates-bitcode-but-why --- kiwixbuild/dependencies/libkiwix.py | 2 -- kiwixbuild/dependencies/libzim.py | 2 -- kiwixbuild/platforms/ios.py | 3 --- 3 files changed, 7 deletions(-) diff --git a/kiwixbuild/dependencies/libkiwix.py b/kiwixbuild/dependencies/libkiwix.py index 79603504..22c15d69 100644 --- a/kiwixbuild/dependencies/libkiwix.py +++ b/kiwixbuild/dependencies/libkiwix.py @@ -24,8 +24,6 @@ def configure_option(self): platformInfo = self.buildEnv.platformInfo if platformInfo.build == 'android': return '-Dstatic-linkage=true -Dwerror=false' - if platformInfo.build == 'iOS': - return '-Db_bitcode=true' if platformInfo.name == 'flatpak': return '--wrap-mode=nodownload' if platformInfo.mixed and option('target') == 'libkiwix': diff --git a/kiwixbuild/dependencies/libzim.py b/kiwixbuild/dependencies/libzim.py index 0d96d75b..a79cb76c 100644 --- a/kiwixbuild/dependencies/libzim.py +++ b/kiwixbuild/dependencies/libzim.py @@ -30,8 +30,6 @@ def configure_option(self): if platformInfo.build == 'android': config_options.append("-DUSE_BUFFER_HEADER=false") config_options.append("-Dstatic-linkage=true") - if platformInfo.build == 'iOS': - config_options.append("-Db_bitcode=true") if platformInfo.mixed and option('target') == 'libzim': config_options.append("-Dstatic-linkage=true") if platformInfo.name == "flatpak": diff --git a/kiwixbuild/platforms/ios.py b/kiwixbuild/platforms/ios.py index 5e591d30..ce86f875 100644 --- a/kiwixbuild/platforms/ios.py +++ b/kiwixbuild/platforms/ios.py @@ -40,13 +40,11 @@ def get_cross_config(self): 'binaries': self.binaries, 'exe_wrapper_def': '', 'extra_libs': [ - '-fembed-bitcode', '-isysroot', self.root_path, '-arch', self.arch, '-target', self.target, ], 'extra_cflags': [ - '-fembed-bitcode', '-isysroot', self.root_path, '-arch', self.arch, '-target', self.target, @@ -74,7 +72,6 @@ def get_env(self): def set_comp_flags(self, env): super().set_comp_flags(env) cflags = [ - '-fembed-bitcode', '-isysroot {}'.format(self.root_path), '-arch {}'.format(self.arch), '-target {}'.format(self.target),