From 3ca3ea4742f937185a1d64f93f9a687147c97212 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Thu, 28 Jul 2011 11:48:28 +1000 Subject: [PATCH] configure: fixed setting of CFG_MAC_ARCHS for mac qpa builds Previously, the mac arch was only put into qconfig.pri for carbon and cocoa builds. Make sure it is also available for qpa builds. This is needed for projects which need to select architecture-specific sources in their .pro file. Change-Id: I5f72e3b699b11dafc4dae052620913f2b9b81d0a Reviewed-on: http://codereview.qt.nokia.com/2313 Reviewed-by: Qt Sanity Bot Reviewed-by: Marius Storm-Olsen --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2bd5c06..74162ca 100755 --- a/configure +++ b/configure @@ -6877,7 +6877,7 @@ fi # For "-carbon" builds: 32 bit x86/ppc. # For builds on snow leopard : compiler default (64-bit). # For builds on leopard : compiler default (32-bit). -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then +if [ "$CFG_ARCH" = "macosx" ] && [ "$CFG_MAC_ARCHS" = "" ]; then source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" if [ "$CFG_MAC_CARBON" = "yes" ]; then @@ -7129,7 +7129,7 @@ fi [ "$CFG_AVX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG avx" [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" -[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" +[ "$CFG_ARCH" = "macosx" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then QT_CONFIG="$QT_CONFIG clock-gettime" fi @@ -8598,7 +8598,7 @@ else echo "Building for: $XPLATFORM" fi -if [ "$PLATFORM_MAC" = "yes" ]; then +if [ ! -z "$CFG_MAC_ARCHS" ]; then echo "Architecture: $CFG_ARCH ($CFG_MAC_ARCHS )" else echo "Architecture: $CFG_ARCH" -- 2.7.4