summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-05-04 07:44:08 (GMT)
committerMorten Sørvig <msorvig@trolltech.com>2009-05-04 07:44:08 (GMT)
commit279a45131ba60fad9f429c7c429271da5b9cc9ac (patch)
treece3908bb8641592caf6642776e151054a5d232d2
parentbdcdb798d2cc4dc48079622a9c3cbe61be82e80b (diff)
downloadQt-279a45131ba60fad9f429c7c429271da5b9cc9ac.zip
Qt-279a45131ba60fad9f429c7c429271da5b9cc9ac.tar.gz
Qt-279a45131ba60fad9f429c7c429271da5b9cc9ac.tar.bz2
Make comment explaning the Mac deployment target setting clearer.
-rwxr-xr-xconfigure9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure b/configure
index b582d85..07a9415 100755
--- a/configure
+++ b/configure
@@ -6004,10 +6004,11 @@ if [ "$CFG_EXCEPTIONS" = "no" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG exceptions_off"
fi
-# On Mac, set the minimum deployment target using Xarch when that is supported (10.5 and up).
-# On 10.4 the deployment version is set to 10.3 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET env. variable
-# "-cocoa" on the command line means Cocoa is used in 32-bit mode also, in this case fall back on
-# QMAKE_MACOSX_DEPLOYMENT_TARGET which will be set to 10.5.
+# On Mac, set the minimum deployment target for the different architechtures
+# using the Xarch compiler option when supported (10.5 and up). On 10.4 the
+# deployment version is set to 10.3 globally using the QMAKE_MACOSX_DEPLOYMENT_TARGET
+# env. variable. "-cocoa" on the command line means Cocoa is used in 32-bit mode also,
+# in this case fall back on QMAKE_MACOSX_DEPLOYMENT_TARGET which will be set to 10.5.
if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] && [ "$COMMANDLINE_MAC_COCOA" != "yes" ]; then
if echo "$CFG_MAC_ARCHS" | grep '\<x86\>' > /dev/null 2>&1; then
QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4"