Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openssl: add embed-bitcode if tools.apple:enable_bitcode is set #14580

Closed
wants to merge 6 commits into from
Closed

openssl: add embed-bitcode if tools.apple:enable_bitcode is set #14580

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94f7090
openssl: add embed-bitcode if tools.apple:enable_bitcode is set
kletoz Dec 5, 2022
f1652ae
openssl: add embed-bitcode to watchOS
kletoz Dec 5, 2022
3bf567d
Merge branch 'conan-io:master' into openssl-bitcode
kletoz Dec 5, 2022
4dd960c
openssl: do not override CFLAGS, append instead
kletoz Dec 5, 2022
fee9eda
openssl: set bitcode in templates instead of env vars
kletoz Jan 17, 2023
7fdfb42
Merge branch 'master' into openssl-bitcode
kletoz Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/openssl/1.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,9 @@ def build(self):
xcrun = tools.XCRun(self.settings)
env_vars["CROSS_SDK"] = os.path.basename(xcrun.sdk_path)
env_vars["CROSS_TOP"] = os.path.dirname(os.path.dirname(xcrun.sdk_path))
if self.settings.os in ["iOS", "tvOS", "watchOS"] and self.conf.get("tools.apple:enable_bitcode", check_type=bool):
cflags = " ".join(self._get_env_build().vars_dict["CFLAGS"])
env_vars["CFLAGS"] = "%s %s" % (cflags, "-fembed-bitcode")
kletoz marked this conversation as resolved.
Show resolved Hide resolved
with tools.environment_append(env_vars):
if self._full_version > "1.1.0":
self._create_targets()
Expand Down
3 changes: 3 additions & 0 deletions recipes/openssl/3.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,9 @@ def build(self):
xcrun = tools.XCRun(self.settings)
env_vars["CROSS_SDK"] = os.path.basename(xcrun.sdk_path)
env_vars["CROSS_TOP"] = os.path.dirname(os.path.dirname(xcrun.sdk_path))
if self.settings.os in ["iOS", "tvOS", "watchOS"] and self.conf.get("tools.apple:enable_bitcode", check_type=bool):
cflags = " ".join(self._get_env_build().vars_dict["CFLAGS"])
env_vars["CFLAGS"] = "%s %s" % (cflags, "-fembed-bitcode")
with tools.environment_append(env_vars):
self._create_targets()
with self._make_context():
Expand Down