diff options
| author | Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk> | 2023-06-28 14:40:05 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-07-25 12:31:33 +0200 |
| commit | 3ced3a44e8b2f5bb6ee3a61ae3d281061fc711f8 (patch) | |
| tree | c3afaca2337076d0ee2e0692d23747697e532f44 | |
| parent | x509: add ASN1_STRING_set() check result (diff) | |
| download | openssl-3ced3a44e8b2f5bb6ee3a61ae3d281061fc711f8.tar.xz openssl-3ced3a44e8b2f5bb6ee3a61ae3d281061fc711f8.zip | |
Adds separate configuration targets for intel i386/x86_64 and arm64 ios simulators
Fixes #21287
CLA: trivial
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21309)
| -rw-r--r-- | Configurations/15-ios.conf | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/Configurations/15-ios.conf b/Configurations/15-ios.conf index 54d37f63f4..234c29c8ae 100644 --- a/Configurations/15-ios.conf +++ b/Configurations/15-ios.conf @@ -1,9 +1,10 @@ #### iPhoneOS/iOS # -# It takes recent enough Xcode to use following two targets. It shouldn't -# be a problem by now, but if they don't work, original targets below -# that depend on manual definition of environment variables should still -# work... +# `xcrun` targets require an Xcode that can determine the correct C compiler via +# `xcrun -sdk iphoneos`. This has been standard in Xcode for a while now - any recent +# Xcode should do. If the Xcode on the build machine doesn't support this then use +# the legacy targets at the end of this file. These require manual definition of +# environment variables. # my %targets = ( "ios-common" => { @@ -34,6 +35,30 @@ my %targets = ( inherit_from => [ "ios-common" ], CC => "xcrun -sdk iphonesimulator cc", }, + "iossimulator-arm64-xcrun" => { + inherit_from => [ "ios-common" ], + CC => "xcrun -sdk iphonesimulator cc", + cflags => add("-arch arm64 -mios-simulator-version-min=7.0.0 -fno-common"), + bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'aarch64', + perlasm_scheme => "ios64", + }, + "iossimulator-i386-xcrun" => { + inherit_from => [ "ios-common" ], + CC => "xcrun -sdk iphonesimulator cc", + cflags => add("-arch i386 -mios-simulator-version-min=7.0.0 -fno-common"), + bn_ops => "BN_LLONG", + asm_arch => 'x86', + perlasm_scheme => "macosx", + }, + "iossimulator-x86_64-xcrun" => { + inherit_from => [ "ios-common" ], + CC => "xcrun -sdk iphonesimulator cc", + cflags => add("-arch x86_64 -mios-simulator-version-min=7.0.0 -fno-common"), + bn_ops => "SIXTY_FOUR_BIT_LONG", + asm_arch => 'x86_64', + perlasm_scheme => "macosx", + }, # It takes three prior-set environment variables to make it work: # # CROSS_COMPILE=/where/toolchain/is/usr/bin/ [note ending slash] |