From 94fc2ca6d8962e31af5571f4c01d928d59acd2ae Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Jul 2020 19:34:27 +0200 Subject: [PATCH] Check minimum macOS version in configure too Targeting anything less than 10.10 is not supported any longer, so check for this and also update --with-macosx-version-min description in help to mention it. --- configure | 8 +++++--- configure.in | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 38aee0cbe3..0c031573db 100755 --- a/configure +++ b/configure @@ -2341,7 +2341,7 @@ Optional Packages: --with-zlib use zlib for LZW compression --with-expat enable XML support using expat parser --with-macosx-sdk=PATH use an OS X SDK at PATH - --with-macosx-version-min=VER build binaries which require at least this OS X version + --with-macosx-version-min=VER build binaries which require at least this OS X version (default and lowest supported: 10.10) --with-cxx=11|14|17 use the given C++ dialect --with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) @@ -18786,8 +18786,10 @@ int main () { - #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 - #else + #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000 + #error macOS versions < 10.10 are not supported. + #endif + #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101100 #error macOS SDK version is too low, 10.11 or later is required. #endif diff --git a/configure.in b/configure.in index e4034af723..ea1968298b 100644 --- a/configure.in +++ b/configure.in @@ -582,7 +582,7 @@ AC_ARG_WITH(macosx-sdk, [ --with-macosx-sdk=PATH use an OS X SDK at PATH], wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" ]) -AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VER build binaries which require at least this OS X version], [ +AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VER build binaries which require at least this OS X version (default and lowest supported: 10.10)], [ wxUSE_MACOSX_VERSION_MIN=$withval wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" ]) @@ -1369,8 +1369,10 @@ version or omitting it entirely." #include ], [ - #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 - #else + #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000 + #error macOS versions < 10.10 are not supported. + #endif + #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101100 #error macOS SDK version is too low, 10.11 or later is required. #endif ],