diff options
author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-03-21 11:22:28 +0000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 16:13:21 +0100 |
commit | c6965407e53637862133880f03049d6f7e7c4256 (patch) | |
tree | e85162696477e8cc00569107a6946d766faa2927 /configure | |
parent | 8ec49c810cf9294b5d311f9571eef0c64e6c867d (diff) |
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>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |