Changeset 561 for trunk/config.tests/mac/defaultarch.test
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/config.tests/mac/defaultarch.test
r2 r561 4 4 VERBOSE=$2 5 5 WORKDIR=$3 6 QT_MAC_DEF UALT_ARCH=6 QT_MAC_DEFAULT_ARCH= 7 7 8 8 touch defaultarch.c … … 18 18 # detect our known archs. 19 19 if echo "$FIlE_OUTPUT" | grep '\<i386\>' > /dev/null 2>&1; then 20 QT_MAC_DEF UALT_ARCH=x86 # configure knows it as "x86" not "i386"20 QT_MAC_DEFAULT_ARCH=x86 # configure knows it as "x86" not "i386" 21 21 fi 22 22 if echo "$FIlE_OUTPUT" | grep '\<x86_64\>' > /dev/null 2>&1; then 23 QT_MAC_DEF UALT_ARCH=x86_6423 QT_MAC_DEFAULT_ARCH=x86_64 24 24 fi 25 25 if echo "$FIlE_OUTPUT" | grep '\<ppc\>' > /dev/null 2>&1; then 26 QT_MAC_DEF UALT_ARCH=ppc26 QT_MAC_DEFAULT_ARCH=ppc 27 27 fi 28 28 if echo "$FIlE_OUTPUT" | grep '\<ppc64\>' > /dev/null 2>&1; then 29 QT_MAC_DEF UALT_ARCH=ppc6429 QT_MAC_DEFAULT_ARCH=ppc64 30 30 fi 31 31 32 [ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEF UALT_ARCH to \"$QT_MAC_DEFUALT_ARCH\""33 export QT_MAC_DEF UALT_ARCH32 [ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFAULT_ARCH to \"$QT_MAC_DEFAULT_ARCH\"" 33 export QT_MAC_DEFAULT_ARCH
Note:
See TracChangeset
for help on using the changeset viewer.