diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-10-29 10:01:42 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-10-29 23:14:04 +0100 |
| commit | 8bf588b64971bf0ca6e6134d871706bb1ee8b7a8 (patch) | |
| tree | 845f9984581746f62fc2c3beaca37c2518d98987 | |
| parent | ce8ac2db2be8a7b6864ea40da8776ef813a13d11 (diff) | |
| download | curl-bagder/configure-version-min.tar.gz | |
acinclude: detect manually set minimum macos/ipod versionbagder/configure-version-min
... even if set in the CC or IPHONEOS/MACOSX_DEPLOYMENT_TARGET
variables.
Fixes #6138
Closes #6140
| -rw-r--r-- | acinclude.m4 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e7a36e4bd..fb77b2cfd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2526,14 +2526,20 @@ AC_DEFUN([CURL_MAC_CFLAGS], [ AC_MSG_RESULT([$tst_cflags]); if test "$tst_cflags" = "yes"; then - AC_MSG_CHECKING([for *version-min in CFLAGS]) + AC_MSG_CHECKING([for *version-min set by user]) min="" - if test -z "$(echo $CFLAGS | grep m.*os.*-version-min)"; then + if test -n "$IPHONEOS_DEPLOYMENT_TARGET"; then + var="IPHONEOS_DEPLOYMENT_TARGET" + elif test -n "$MACOSX_DEPLOYMENT_TARGET"; then + var="MACOSX_DEPLOYMENT_TARGET" + elif test -z "$(echo $CFLAGS $CC | grep m.*os.*-version-min)"; then min="-mmacosx-version-min=10.8" CFLAGS="$CFLAGS $min" + else + var="CFLAGS or CC" fi if test -z "$min"; then - AC_MSG_RESULT([set by user]) + AC_MSG_RESULT([set by user in $var]) else AC_MSG_RESULT([$min set]) fi |