From 7226a8f4dfd772c08dc8139eb4afa21da96707f5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 16 Jan 2019 14:51:08 +0100
Subject: [PATCH] Use 10.9 SDK by default in configure under macOS

On modern macOS systems, libstdc++ headers are not installed by default
any more and using 10.7 SDK requires them, so running configure fails
out of the box.

Avoid this by defaulting to the earliest SDK version which works even
under 10.14.
---
 configure        | 5 ++---
 configure.in     | 6 +++---
 docs/changes.txt | 3 +++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index f7dd626d22..14a8931a16 100755
--- a/configure
+++ b/configure
@@ -20147,8 +20147,7 @@ if test "$wxUSE_MAC" = 1; then
 if test "x$wxUSE_MACOSX_SDK" = "xno"; then
     wxUSE_MACOSX_SDK=
 elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
-    # TODO: Search for most recent SDK and use it.
-    wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
+        wxUSE_MACOSX_SDK="`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
 fi
 
 
@@ -20198,7 +20197,7 @@ $as_echo "$as_me: WARNING: Could not determine deployment target from SDKSetting
         wxUSE_MACOSX_VERSION_MIN=
     fi
 elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
-    wxUSE_MACOSX_VERSION_MIN=10.7
+    wxUSE_MACOSX_VERSION_MIN=10.9
 fi
 
 if test "x$MACOSX_SDK_OPTS" != "x"; then
diff --git a/configure.in b/configure.in
index 4b427d1804..0cb8ed4d74 100644
--- a/configure.in
+++ b/configure.in
@@ -1222,8 +1222,8 @@ dnl NOTE: We clobber wxUSE_MACOSX_SDK with the SDK path
 if test "x$wxUSE_MACOSX_SDK" = "xno"; then
     wxUSE_MACOSX_SDK=
 elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
-    # TODO: Search for most recent SDK and use it.
-    wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
+    dnl Try to use the default SDK.
+    wxUSE_MACOSX_SDK="`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
 fi
 
 
@@ -1275,7 +1275,7 @@ dnl We need to quote the next line where we don't need macros and do need [] in
         wxUSE_MACOSX_VERSION_MIN=
     fi
 elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
-    wxUSE_MACOSX_VERSION_MIN=10.7
+    wxUSE_MACOSX_VERSION_MIN=10.9
 fi
 
 if test "x$MACOSX_SDK_OPTS" != "x"; then
diff --git a/docs/changes.txt b/docs/changes.txt
index ff9a427e8e..9cb54f6b15 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -108,6 +108,9 @@ Changes in behaviour which may result in build errors
   wxArrayString. Please update your code to use the appropriate setter
   Set[Char]{In,Ex}cludes(), instead of mutating the internal data directly.
 
+- Under macOS, configure builds use 10.9 SDK by default now. 10.7 SDK is still
+  supported, but must be explicitly selected.
+
 
 3.1.3: (released 2019-??-??)
 ----------------------------