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

Do Mac-specific checks in configure for all ports under Darwin

Browse Source 
Configure options such as --enable-universal_binary or
--with-macosx-version-min should be taken into account for any port
being built under macOS, not just wxOSX itself.

In particular, this ensures that PCH and dependencies tracking is
correctly disabled automatically when building universal wxGTK
libraries.

Closes #15454.
This commit is contained in:
Vadim Zeitlin
2017-10-21 18:59:16 +02:00
parent 5ba7a1d166
commit 4754621959
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@@ -17388,7 +17388,7 @@ fi
fi
if test "$wxUSE_MAC" = 1; then
if test "$USE_DARWIN" = 1; then
retest_macosx_linking=no
@@ -17440,6 +17440,8 @@ $as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary
LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
fi
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
@@ -17464,6 +17466,7 @@ $as_echo "exists" >&6; }
retest_macosx_linking=yes
fi
fi
if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then
wxUSE_MACOSX_VERSION_MIN=
elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then

11
configure.in
View File

@@ -1121,7 +1121,10 @@ dnl ---------------------------------------------------------------------------
dnl Mac-specific SDK/architectures checks
dnl ---------------------------------------------------------------------------
if test "$wxUSE_MAC" = 1; then
dnl Note that some checks here are OS-specific, and need to be done for any
dnl port, while others are wxOSX-specific and are performed only for it inside
dnl another test below.
if test "$USE_DARWIN" = 1; then
retest_macosx_linking=no
@@ -1191,6 +1194,8 @@ if test "x$OSX_ARCH_OPTS" != "x"; then
LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
fi
if test "$wxUSE_MAC" = 1; then
dnl Set up the Mac OS X SDK. We do this early so configure tests will occur
dnl with the SDK in place.
dnl NOTE: We clobber wxUSE_MACOSX_SDK with the SDK path
@@ -1217,6 +1222,8 @@ if test "x$wxUSE_MACOSX_SDK" != "x"; then
dnl if we ever did, be aware that you don't need to worry about it.
fi
fi dnl wxUSE_MAC
dnl Set up the deployment target
dnl No : Don't specify a min version even if using an SDK
dnl Yes : Use the version from the SDK if used, otherwise same as no
@@ -1294,7 +1301,7 @@ if test "x$retest_macosx_linking" = "xyes"; then
AC_LANG_POP()
fi
fi dnl wxUSE_MAC
fi dnl USE_DARWIN
case "${host}" in