1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Idd066010334999376d8b2c9619d797e4eb1f1153
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Sean Harmer 2012-03-21 11:22:28 +00:00 committed by Qt by Nokia
parent 8ec49c810c
commit c6965407e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -5420,7 +5420,7 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then
fi fi
# Detect the default arch (x86 or x86_64) on Mac OS X # 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= DEFAULT_ARCH=
case `file "${outpath}/bin/qmake"` in case `file "${outpath}/bin/qmake"` in
*i?86) *i?86)