From 4d0bd4858291106d8e2b1e4ce2a5fd29eb3cf52e Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Thu, 10 Nov 2022 15:47:03 +0100 Subject: [PATCH] rely on `tools.apple:enable_bitcode` instead of custom option --- recipes/boost/all/conanfile.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/recipes/boost/all/conanfile.py b/recipes/boost/all/conanfile.py index 2a357d4a6debf..869b56b13a3df 100644 --- a/recipes/boost/all/conanfile.py +++ b/recipes/boost/all/conanfile.py @@ -106,7 +106,6 @@ class BoostConan(ConanFile): "buildid": "ANY", "python_buildid": "ANY", "system_use_utf8": [True, False], - "embed_bitcode": [True, False], # enables embedding bitcode for iOS } options.update({f"without_{_name}": [True, False] for _name in CONFIGURE_OPTIONS}) @@ -145,7 +144,6 @@ class BoostConan(ConanFile): "buildid": None, "python_buildid": None, "system_use_utf8": False, - "embed_bitcode": True, } default_options.update({f"without_{_name}": False for _name in CONFIGURE_OPTIONS}) default_options.update({f"without_{_name}": True for _name in ("graph_parallel", "mpi", "python")}) @@ -291,11 +289,6 @@ def config_options(self): self.options.without_json = True self.options.without_nowide = True - # bitcode is deprecated in Xcode 14, and the AppStore will not accept submissions from Xcode 14 with bitcode enabled - # https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes - if not is_apple_os(self) or Version(self.settings.compiler.version) >= 14.0: - del self.options.embed_bitcode - # iconv is off by default on Windows and Solaris if self._is_windows_platform or self.settings.os == "SunOS": self.options.i18n_backend_iconv = "off" @@ -1116,7 +1109,7 @@ def add_defines(library): if self.options.multithreading: cxx_flags.append("-DBOOST_SP_USE_SPINLOCK") - if "embed_bitcode" in self.options and self.options.embed_bitcode: + if self.conf.get("tools.apple:enable_bitcode", check_type=bool): cxx_flags.append("-fembed-bitcode") if self._with_iconv: