From: Lars Schmertmann <SmallLars@t-online.de>
Date: Fri, 19 Jan 2024 15:24:52 +0000 (+0100)
Subject: Remove mios-simulator-version-min from default iOS configuration
X-Git-Tag: openssl-3.3.0-alpha1~276
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ed9a32a2aee89e10eb2891f5fb7a283e1b5199b;p=thirdparty%2Fopenssl.git

Remove mios-simulator-version-min from default iOS configuration

* iOS 6 and 7 got its last updates 2014.
* Adding -mios-simulator-version-min=14.0 to the configure command leads to two occurences of this parameter during compilation.
* So lets remove this values to allow a robust configuration from outside and avoid updates here in the future.

CLA: trivial

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23344)
---

diff --git a/Configurations/15-ios.conf b/Configurations/15-ios.conf
index 234c29c8ae7..e2b27b277b1 100644
--- a/Configurations/15-ios.conf
+++ b/Configurations/15-ios.conf
@@ -19,14 +19,14 @@ my %targets = (
         # 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"),
+        cflags           => add("-arch armv7 -fno-common"),
         asm_arch         => 'armv4',
         perlasm_scheme   => "ios32",
     },
     "ios64-xcrun" => {
         inherit_from     => [ "ios-common" ],
         CC               => "xcrun -sdk iphoneos cc",
-        cflags           => add("-arch arm64 -mios-version-min=7.0.0 -fno-common"),
+        cflags           => add("-arch arm64 -fno-common"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         asm_arch         => 'aarch64',
         perlasm_scheme   => "ios64",
@@ -38,7 +38,7 @@ my %targets = (
     "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"),
+        cflags           => add("-arch arm64 -fno-common"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         asm_arch         => 'aarch64',
         perlasm_scheme   => "ios64",
@@ -46,7 +46,7 @@ my %targets = (
     "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"),
+        cflags           => add("-arch i386 -fno-common"),
         bn_ops           => "BN_LLONG",
         asm_arch         => 'x86',
         perlasm_scheme   => "macosx",
@@ -54,7 +54,7 @@ my %targets = (
     "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"),
+        cflags           => add("-arch x86_64 -fno-common"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         asm_arch         => 'x86_64',
         perlasm_scheme   => "macosx",