diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 22:30:28 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-04 22:30:28 (GMT) |
| commit | 40db84c97769141f3f2351de1b2d5c64904fe5c2 (patch) | |
| tree | f674a92a37a130e1ce0bfd7080019fe3b36e9c1b /configure | |
| parent | 897014a47b41dcf2b9d91549be9b96890d5291c7 (diff) | |
| parent | 2843c97f5310f4636c933ced56570ab7db2b707e (diff) | |
| download | Qt-40db84c97769141f3f2351de1b2d5c64904fe5c2.zip Qt-40db84c97769141f3f2351de1b2d5c64904fe5c2.tar.gz Qt-40db84c97769141f3f2351de1b2d5c64904fe5c2.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 22 |
1 files changed, 14 insertions, 8 deletions
@@ -5707,17 +5707,23 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then QT_CONFIG="$QT_CONFIG dwarf2" fi -# Set the default arch. Select 32-bit/carbon if nothing else has -# been specified on the configure line. +# Set the default arch. +# Carbon builds: 32 bit x86/ppc. +# For "-cocoa" builds on snow leopard : compiler default (64-bit). +# For "-cocoa" builds on leopard : compiler default (32-bit). if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" == "" ]; then source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" - if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then - CFG_MAC_ARCHS=" x86" - elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then - CFG_MAC_ARCHS=" ppc" - else - CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH" + if [ "$CFG_MAC_COCOA" != "yes" ]; then + if [ "$QT_MAC_DEFAULT_ARCH" == "x86_64" ]; then + CFG_MAC_ARCHS=" x86" + elif [ "$QT_MAC_DEFAULT_ARCH" == "ppc64" ]; then + CFG_MAC_ARCHS=" ppc" + else + CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH" + fi + else + CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH" fi [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." |