diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-22 12:32:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-22 12:32:27 (GMT) |
| commit | d001cef792b2f41615cb1f7657bed3d7525ffb0e (patch) | |
| tree | 03ec9dc4a9a870d2b8902083d56431d8b4b54217 /configure | |
| parent | a0fb8f874d0b8b8db5f50706a432bdb5a0294bf0 (diff) | |
| parent | 1cfb5bcaa2cab142479ee975e25d9f605f852dad (diff) | |
| download | Qt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.zip Qt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.tar.gz Qt-d001cef792b2f41615cb1f7657bed3d7525ffb0e.tar.bz2 | |
Merge branch '4.5'
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -202,7 +202,7 @@ earlyArgParse() VAL=$1 fi ;; - h|help|--help|-help) + -h|help|--help|-help) if [ "$VAL" = "yes" ]; then OPT_HELP="$VAL" COMMERCIAL_USER="no" #doesn't matter we will display the help @@ -2718,7 +2718,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then # Build commmand line arguments we can pass to the compiler during configure tests # by prefixing each arch with "-arch". CFG_MAC_ARCHS_GCC_FORMAT="${CFG_MAC_ARCHS/x86/i386}" - CFG_MAC_ARCHS_GCC_FORMAT="${CFG_MAC_ARCHS/i386_64/x86_64}" + CFG_MAC_ARCHS_GCC_FORMAT="${CFG_MAC_ARCHS_GCC_FORMAT/i386_64/x86_64}" for ARCH in $CFG_MAC_ARCHS_GCC_FORMAT; do MAC_ARCHS_COMMANDLINE="$MAC_ARCHS_COMMANDLINE -arch $ARCH" done |