Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/config.tests/mac/defaultarch.test

    r2 r561  
    44VERBOSE=$2
    55WORKDIR=$3
    6 QT_MAC_DEFUALT_ARCH=
     6QT_MAC_DEFAULT_ARCH=
    77
    88touch defaultarch.c
     
    1818# detect our known archs.
    1919if echo "$FIlE_OUTPUT" | grep '\<i386\>' > /dev/null 2>&1; then
    20     QT_MAC_DEFUALT_ARCH=x86 # configure knows it as "x86" not "i386"
     20    QT_MAC_DEFAULT_ARCH=x86 # configure knows it as "x86" not "i386"
    2121fi
    2222if echo "$FIlE_OUTPUT" | grep '\<x86_64\>' > /dev/null 2>&1; then
    23     QT_MAC_DEFUALT_ARCH=x86_64
     23    QT_MAC_DEFAULT_ARCH=x86_64
    2424fi
    2525if echo "$FIlE_OUTPUT" | grep '\<ppc\>' > /dev/null 2>&1; then
    26     QT_MAC_DEFUALT_ARCH=ppc
     26    QT_MAC_DEFAULT_ARCH=ppc
    2727fi
    2828if echo "$FIlE_OUTPUT" | grep '\<ppc64\>' > /dev/null 2>&1; then
    29     QT_MAC_DEFUALT_ARCH=ppc64
     29    QT_MAC_DEFAULT_ARCH=ppc64
    3030fi
    3131
    32 [ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFUALT_ARCH to \"$QT_MAC_DEFUALT_ARCH\""
    33 export QT_MAC_DEFUALT_ARCH
     32[ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFAULT_ARCH to \"$QT_MAC_DEFAULT_ARCH\""
     33export QT_MAC_DEFAULT_ARCH
Note: See TracChangeset for help on using the changeset viewer.