wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configurations/10-main.conf: force no-engine on ios targets.

Browse source 
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)
This commit is contained in:
Andy Polyakov 2018-04-26 19:22:04 +02:00
parent bf7ae75000
commit 7069eaee23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Configurations/10-main.conf
View file

@ -1592,6 +1592,7 @@ my %targets = (
inherit_from => [ "darwin-common" ], inherit_from => [ "darwin-common" ],
cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"), cflags => add("-isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
sys_id => "iOS", sys_id => "iOS",
disable => [ "engine" ],
}, },
"ios-cross" => { "ios-cross" => {
inherit_from => [ "darwin-common", asm("armv4_asm") ], 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"), cflags => add("-arch armv7 -mios-version-min=6.0.0 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fno-common"),
sys_id => "iOS", sys_id => "iOS",
perlasm_scheme => "ios32", perlasm_scheme => "ios32",
disable => [ "engine" ],
}, },
"ios64-cross" => { "ios64-cross" => {
inherit_from => [ "darwin-common", asm("aarch64_asm") ], inherit_from => [ "darwin-common", asm("aarch64_asm") ],
@ -1608,6 +1610,7 @@ my %targets = (
sys_id => "iOS", sys_id => "iOS",
bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
perlasm_scheme => "ios64", perlasm_scheme => "ios64",
disable => [ "engine" ],
}, },
##### GNU Hurd ##### GNU Hurd