(conan-io#15336) openssl: add embed-bitcode if tools.apple:enable_bit…

…code is set * openssl: add embed-bitcode if tools.apple:enable_bitcode is set * openssl: add embed-bitcode to watchOS * openssl: do not override CFLAGS, append instead * openssl: set bitcode in templates instead of env vars --------- Co-authored-by: Chris Mc <[email protected]>
AbrilRBS · Mar 27, 2023 · f3b003a · f3b003a
1 parent 1404cf3
commit f3b003a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/recipes/openssl/1.x.x/conanfile.py b/recipes/openssl/1.x.x/conanfile.py
@@ -649,6 +649,10 @@ def _create_targets(self):
             if self.options.get_safe("fPIC", True):
                 shared_cflag='shared_cflag => "-fPIC",'
 
+        if self.settings.os in ["iOS", "tvOS", "watchOS"] and self.conf.get("tools.apple:enable_bitcode", check_type=bool):
+            cflags.append("-fembed-bitcode")
+            cxxflags.append("-fembed-bitcode")
+
         config = config_template.format(targets=targets,
                                         target=self._target,
                                         ancestor=ancestor,

diff --git a/recipes/openssl/3.x.x/conanfile.py b/recipes/openssl/3.x.x/conanfile.py
@@ -506,6 +506,10 @@ def _create_targets(self):
             if self.options.get_safe("fPIC", True):
                 shared_cflag = 'shared_cflag => "-fPIC",'
 
+        if self.settings.os in ["iOS", "tvOS", "watchOS"] and self.conf.get("tools.apple:enable_bitcode", check_type=bool):
+            cflags.append("-fembed-bitcode")
+            cxxflags.append("-fembed-bitcode")
+
         config = config_template.format(
             targets=targets,
             target=self._target,