Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 10.9 SDK by default in configure under macOS

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin
2019-01-16 14:51:08 +01:00
parent f09b3de914
commit 7226a8f4df
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

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

6
configure.in
View File

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

3
docs/changes.txt
View File

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