Skip to content

Commit 5f6487a

Browse files
[3.13] gh-156115: Use the simulator deployment-target flag for iOS simulator builds (GH-156116) (#156213)
Ensures that CFLAGS and LDFLAGS use -mios-simulator-version-min, rather than the device-based -mios-version-min. This only matters if the CFLAGS and LDFLAGS are used in a bare call to clang without a -target; but that is a legal usage, so it's worth catching. (cherry picked from commit d856402) Co-authored-by: Clément Péron <peron.clem@gmail.com>
1 parent 8be8128 commit 5f6487a

3 files changed

Lines changed: 17 additions & 4 deletions

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
iOS simulator builds are now configured with
2+
``-mios-simulator-version-min`` instead of the device's
3+
``-mios-version-min``. The device flag made the linker reject libraries
4+
resolved from the simulator SDK, so library detection silently failed.

configure

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -945,8 +945,12 @@ AS_CASE([$host],
945945
)
946946

947947
dnl Add the compiler flag for the iOS minimum supported OS version.
948-
AS_CASE([$ac_sys_system],
949-
[iOS], [
948+
AS_CASE([$host],
949+
[*-apple-ios*-simulator], [
950+
AS_VAR_APPEND([CFLAGS], [" -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
951+
AS_VAR_APPEND([LDFLAGS], [" -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
952+
],
953+
[*-apple-ios*], [
950954
AS_VAR_APPEND([CFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
951955
AS_VAR_APPEND([LDFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
952956
],

0 commit comments

Comments
 (0)