summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorDominic Letz <dominic@diode.io>2021-09-22 18:03:28 +0200
committerDmitry Belyavskiy <beldmit@gmail.com>2021-09-24 11:04:55 +0200
commitf8543a08ffe18485b2e1361d4f496d33d6e6f35e (patch)
treefa4e9cf006d6cbc308d13342f8fe2389ae3a49c3 /Configurations
parentb3242ca622ef3da34ebb7b78b1f82cd5f0b516e7 (diff)
Update 15-ios.conf
CLA: trivial I assume this has been an error in the initial ios conf file. In order to build for ios the shared engine library, needs to be disabled because iOS doesn't have the concept of shared libraries. But instead of only disabling `dynamic-engine` (or like in this commit disabled the `shared`) option the previous config did disable `engine` and with that the `static-engine` compilation as well. This restores the `static-engine` option being enabled by default, but keeping compilation going on iOS. Cheers! Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/16659) (cherry picked from commit aa58071e4b8b245db1564f476731c978738e7e98)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/15-ios.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/15-ios.conf b/Configurations/15-ios.conf
index 4b5aeecc28..54d37f63f4 100644
--- a/Configurations/15-ios.conf
+++ b/Configurations/15-ios.conf
@@ -10,7 +10,7 @@ my %targets = (
template => 1,
inherit_from => [ "darwin-common" ],
sys_id => "iOS",
- disable => [ "engine", "async" ],
+ disable => [ "shared", "async" ],
},
"ios-xcrun" => {
inherit_from => [ "ios-common" ],