From b436a24d225ba0da407556017778f3037f82973d Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Thu, 19 Nov 2020 17:17:08 +0100 Subject: [PATCH] Fix min iOS SDK overridden globally Some targets enforce iOS 13.0 as minimum SDK, whereas current script was overriding IOS_MIN_SDK_VERSION at a global scope. Override min SDK 13.0 in those targets specifically. See 1cf972d36ff4ff5a39b2a22c80fad3dd955a98aa Fixes #30 --- config/20-all-platforms.conf | 6 +++--- scripts/build-loop-targets.sh | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/config/20-all-platforms.conf b/config/20-all-platforms.conf index 17fe047..894b3fb 100644 --- a/config/20-all-platforms.conf +++ b/config/20-all-platforms.conf @@ -69,7 +69,7 @@ my %targets = (); # Simulator (arm64) "ios-sim-cross-arm64" => { inherit_from => [ "darwin64-arm64-cc", "ios-cross-base" ], - cflags => add("-target arm64-apple-ios13.0-simulator"), + cflags => add("-target arm64-apple-ios13.0-simulator -mios-version-min=13.0"), sys_id => "iOS", }, @@ -98,13 +98,13 @@ my %targets = (); # Catalyst (x86_64) "mac-catalyst-x86_64" => { inherit_from => [ "darwin64-x86_64-cc", "mac-catalyst-base" ], - cflags => add("-target x86_64-apple-ios13.0-macabi"), + cflags => add("-target x86_64-apple-ios13.0-macabi -mios-version-min=13.0"), sys_id => "MacOSX", }, # Catalyst (arm64) "mac-catalyst-arm64" => { inherit_from => [ "darwin64-arm64-cc", "mac-catalyst-base" ], - cflags => add("-target arm64-apple-ios13.0-macabi "), + cflags => add("-target arm64-apple-ios13.0-macabi -mios-version-min=13.0"), sys_id => "MacOSX", }, diff --git a/scripts/build-loop-targets.sh b/scripts/build-loop-targets.sh index 4622df0..4ded388 100755 --- a/scripts/build-loop-targets.sh +++ b/scripts/build-loop-targets.sh @@ -61,9 +61,6 @@ do PLATFORM="AppleTVOS" elif [[ "${TARGET}" == "ios-sim-cross-"* ]]; then PLATFORM="iPhoneSimulator" - if [[ "${TARGET}" == "ios-sim-cross-arm64" ]]; then - IOS_MIN_SDK_VERSION="13.0" - fi else PLATFORM="iPhoneOS" fi