Skip to content

Commit 844b93d

Browse files
committed
Select the flag from the host triple directly
1 parent 31bf620 commit 844b93d

2 files changed

Lines changed: 17 additions & 20 deletions

File tree

configure

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

configure.ac

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,15 +1006,14 @@ AS_CASE([$host],
10061006
)
10071007

10081008
dnl Add the compiler flag for the iOS minimum supported OS version.
1009-
AS_CASE([$ac_sys_system],
1010-
[iOS], [
1011-
dnl -mios-version-min names the device platform; against the simulator SDK it
1012-
dnl makes the linker reject every dylib it resolves there.
1013-
AS_IF([test "x$_host_device" = "xsimulator"],
1014-
[_ios_version_min_flag=-mios-simulator-version-min],
1015-
[_ios_version_min_flag=-mios-version-min])
1016-
AS_VAR_APPEND([CFLAGS], [" ${_ios_version_min_flag}=${IPHONEOS_DEPLOYMENT_TARGET}"])
1017-
AS_VAR_APPEND([LDFLAGS], [" ${_ios_version_min_flag}=${IPHONEOS_DEPLOYMENT_TARGET}"])
1009+
AS_CASE([$host],
1010+
[*-apple-ios*-simulator], [
1011+
AS_VAR_APPEND([CFLAGS], [" -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
1012+
AS_VAR_APPEND([LDFLAGS], [" -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
1013+
],
1014+
[*-apple-ios*], [
1015+
AS_VAR_APPEND([CFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
1016+
AS_VAR_APPEND([LDFLAGS], [" -mios-version-min=${IPHONEOS_DEPLOYMENT_TARGET}"])
10181017
],
10191018
)
10201019

0 commit comments

Comments
 (0)