moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

acinclude: detect manually set minimum macos/ipod version 

... even if set in the CC or IPHONEOS/MACOSX_DEPLOYMENT_TARGET
variables.

Reported-by: hamstergene on github
Fixes #6138
Closes #6140
This commit is contained in:
Daniel Stenberg 2020-10-29 10:01:42 +01:00
parent e4d38014cd
commit c131148b69
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acinclude.m4
View File

@ -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