projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ec49c8
)
Add x86_64 to CONFIG on Mac OSX only when not cross-compiling
author
Sean Harmer
<sean.harmer.qnx@kdab.com>
Wed, 21 Mar 2012 11:22:28 +0000
(11:22 +0000)
committer
Qt by Nokia
<qt-info@nokia.com>
Thu, 22 Mar 2012 15:13:21 +0000
(16:13 +0100)
Change-Id: Idd066010334999376d8b2c9619d797e4eb1f1153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
configure
patch
|
blob
|
history
diff --git
a/configure
b/configure
index
32dd5f0
..
1f580d3
100755
(executable)
--- 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)