X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=Configurations%2F15-ios.conf;h=4b5aeecc28a5c39eb0295af5b8ba828f8c39745c;hb=7674e92324648b59786d86d8e9014bbaed4e6d07;hp=1bb9f48d0650524218fa475d1efa6181b2a25cdc;hpb=04e3f9a114c2c142356ef1639d68397a72e0c7f8;p=openssl.git diff --git a/Configurations/15-ios.conf b/Configurations/15-ios.conf index 1bb9f48d06..4b5aeecc28 100644 --- a/Configurations/15-ios.conf +++ b/Configurations/15-ios.conf @@ -1,6 +1,6 @@ #### iPhoneOS/iOS # -# It takes recent enough XCode to use following two targets. It shouldn't +# 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... @@ -13,19 +13,21 @@ my %targets = ( disable => [ "engine", "async" ], }, "ios-xcrun" => { - inherit_from => [ "ios-common", asm("armv4_asm") ], + inherit_from => [ "ios-common" ], # It should be possible to go below iOS 6 and even add -arch armv6, # thus targeting iPhone pre-3GS, but it's assumed to be irrelevant # at this point. CC => "xcrun -sdk iphoneos cc", cflags => add("-arch armv7 -mios-version-min=6.0.0 -fno-common"), + asm_arch => 'armv4', perlasm_scheme => "ios32", }, "ios64-xcrun" => { - inherit_from => [ "ios-common", asm("aarch64_asm") ], + inherit_from => [ "ios-common" ], CC => "xcrun -sdk iphoneos cc", cflags => add("-arch arm64 -mios-version-min=7.0.0 -fno-common"), bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", + asm_arch => 'aarch64', perlasm_scheme => "ios64", }, "iossimulator-xcrun" => {