Skip to content

Commit 4d0bd48

Browse files
committed
rely on tools.apple:enable_bitcode instead of custom option
1 parent 78d472e commit 4d0bd48

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

recipes/boost/all/conanfile.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ class BoostConan(ConanFile):
106106
"buildid": "ANY",
107107
"python_buildid": "ANY",
108108
"system_use_utf8": [True, False],
109-
"embed_bitcode": [True, False], # enables embedding bitcode for iOS
110109
}
111110
options.update({f"without_{_name}": [True, False] for _name in CONFIGURE_OPTIONS})
112111

@@ -145,7 +144,6 @@ class BoostConan(ConanFile):
145144
"buildid": None,
146145
"python_buildid": None,
147146
"system_use_utf8": False,
148-
"embed_bitcode": True,
149147
}
150148
default_options.update({f"without_{_name}": False for _name in CONFIGURE_OPTIONS})
151149
default_options.update({f"without_{_name}": True for _name in ("graph_parallel", "mpi", "python")})
@@ -291,11 +289,6 @@ def config_options(self):
291289
self.options.without_json = True
292290
self.options.without_nowide = True
293291

294-
# bitcode is deprecated in Xcode 14, and the AppStore will not accept submissions from Xcode 14 with bitcode enabled
295-
# https://developer.apple.com/documentation/xcode-release-notes/xcode-14-release-notes
296-
if not is_apple_os(self) or Version(self.settings.compiler.version) >= 14.0:
297-
del self.options.embed_bitcode
298-
299292
# iconv is off by default on Windows and Solaris
300293
if self._is_windows_platform or self.settings.os == "SunOS":
301294
self.options.i18n_backend_iconv = "off"
@@ -1116,7 +1109,7 @@ def add_defines(library):
11161109
if self.options.multithreading:
11171110
cxx_flags.append("-DBOOST_SP_USE_SPINLOCK")
11181111

1119-
if "embed_bitcode" in self.options and self.options.embed_bitcode:
1112+
if self.conf.get("tools.apple:enable_bitcode", check_type=bool):
11201113
cxx_flags.append("-fembed-bitcode")
11211114

11221115
if self._with_iconv:

0 commit comments

Comments
 (0)