AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If gcc-4.2+ is specified for compiling OS X Carbon or 10.4 compatilbility is specified, switch to gcc-4.0 to avoid configuration conflicts. Also, do not default to 10.4 compatibility when building OS X Cocoa so that we can get 64-bit builds on Snow Leopard by default.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier 2009-09-05 00:12:39 +00:00
parent 0c4311ca1e
commit 8e6b680de8
2 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 61278 2009-07-02 09:00:20Z VZ .
# From configure.in Id: configure.in 61322 2009-07-05 11:51:53Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1.
#
@ -18212,9 +18212,42 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl
wxUSE_MACOSX_VERSION_MIN=
fi
elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
if test "$wxUSE_MAC" = 1; then
OSX_VERSION=`sw_vers -productVersion | grep 10.[0-9]`
if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
# otherwise configure stops on leopard for universal_binary
wxUSE_MACOSX_VERSION_MIN=10.4
else
# for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard
wxUSE_MACOSX_VERSION_MIN=10.5
fi
fi
NEEDS_GCC40="no"
if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then
NEEDS_GCC40="yes"
fi
if test "$wxUSE_OSX_CARBON" = 1; then
NEEDS_GCC40="yes"
fi
if test "x$NEEDS_GCC40" == "xyes"; then
# gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it
# and wants 10.4 compatible code, then 'downgrade' to 4.0
# This is also the simplest way to get 32-bit binaries on Snow Leopard.
if test "x$CC" = "xgcc"; then
CCVERSION=`$CC --version | grep 4.[2-9].`
if test "x$CCVERSION" != "x"; then
echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
CC="/usr/bin/gcc-4.0"
fi
fi
if test "x$CXX" = "xg++"; then
CCVERSION=`$CXX --version | grep 4.[2-9].`
if test "x$CCVERSION" != "x"; then
CXX="/usr/bin/g++-4.0"
fi
fi
fi

35
configure.in
View File

@ -1163,9 +1163,42 @@ 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
if test "$wxUSE_MAC" = 1; then
OSX_VERSION=`sw_vers -productVersion | grep 10.[[0-9]]`
if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
# otherwise configure stops on leopard for universal_binary
wxUSE_MACOSX_VERSION_MIN=10.4
else
# for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard
wxUSE_MACOSX_VERSION_MIN=10.5
fi
fi
NEEDS_GCC40="no"
if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then
NEEDS_GCC40="yes"
fi
if test "$wxUSE_OSX_CARBON" = 1; then
NEEDS_GCC40="yes"
fi
if test "x$NEEDS_GCC40" == "xyes"; then
# gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it
# and wants 10.4 compatible code, then 'downgrade' to 4.0
# This is also the simplest way to get 32-bit binaries on Snow Leopard.
if test "x$CC" = "xgcc"; then
CCVERSION=`$CC --version | grep 4.[[2-9]].`
if test "x$CCVERSION" != "x"; then
echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
CC="/usr/bin/gcc-4.0"
fi
fi
if test "x$CXX" = "xg++"; then
CCVERSION=`$CXX --version | grep 4.[[2-9]].`
if test "x$CCVERSION" != "x"; then
CXX="/usr/bin/g++-4.0"
fi
fi
fi