summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2018-04-26 19:22:04 +0200
committerAndy Polyakov <appro@openssl.org>2018-04-29 21:30:02 +0200
commit7069eaee23a1e34727b632171346112563306819 (patch)
tree0afa89a4c9366a840dc0071bd45d0258ab6133f7
parentbf7ae7500073f85fed8a82c4f8ec981d44a8c3d6 (diff)
Configurations/10-main.conf: force no-engine on ios targets.
Rationale for enforcing no-engine is because of disconnect between compile-time config and run-time, which is a per-application sandbox directory which one can't predict in advance. Besides, none of the bundled engines actually give an edge on iOS... Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6106)
-rw-r--r--Configurations/10-main.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index cb3e05e64c..8d55ad84f9 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1592,6 +1592,7 @@ my %targets = (
inherit_from => [ "darwin-common" ],
cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
sys_id => "iOS",
+ disable => [ "engine" ],
},
"ios-cross" => {
inherit_from => [ "darwin-common", asm("armv4_asm") ],
@@ -1601,6 +1602,7 @@ my %targets = (
cflags => add("-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
sys_id => "iOS",
perlasm_scheme => "ios32",
+ disable => [ "engine" ],
},
"ios64-cross" => {
inherit_from => [ "darwin-common", asm("aarch64_asm") ],
@@ -1608,6 +1610,7 @@ my %targets = (
sys_id => "iOS",
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "ios64",
+ disable => [ "engine" ],
},
##### GNU Hurd