From c131148b695afd9cf6601ce8879711ccb8ba0a9d Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 29 Oct 2020 10:01:42 +0100
Subject: [PATCH] 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
---
 acinclude.m4 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index e7a36e4bd6..fb77b2cfde 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