From: Sean Harmer <sean.harmer.qnx@kdab.com>
Date: Wed, 21 Mar 2012 11:22:28 +0000 (+0000)
Subject: Add x86_64 to CONFIG on Mac OSX only when not cross-compiling
X-Git-Tag: qt-v5.0.0-alpha1~143
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6965407e53637862133880f03049d6f7e7c4256;p=profile%2Fivi%2Fqtbase.git

Add x86_64 to CONFIG on Mac OSX only when not cross-compiling

Change-Id: Idd066010334999376d8b2c9619d797e4eb1f1153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
---

diff --git a/configure b/configure
index 32dd5f0..1f580d3 100755
--- a/configure
+++ b/configure
@@ -5420,7 +5420,7 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then
 fi
 
 # Detect the default arch (x86 or x86_64) on Mac OS X
-if [ "$BUILD_ON_MAC" = "yes" ]; then
+if [ "$BUILD_ON_MAC" = "yes" ] && [ "$QT_CROSS_COMPILE" = "no" ]; then
     DEFAULT_ARCH=
     case `file "${outpath}/bin/qmake"` in
     *i?86)