diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-05-20 11:24:25 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-05-20 11:24:25 (GMT) |
| commit | 1ee923a21c270094203c5d2a861a8015598ceda1 (patch) | |
| tree | d53b292eabb1fc565840153d8f5efb3c3b2afd52 /configure | |
| parent | 4e4ff34e3c4c905f17aa02160a17fdb7b9ad61ed (diff) | |
| parent | 691e83425ac5883922837bc5fd1efb5385db9871 (diff) | |
| download | Qt-1ee923a21c270094203c5d2a861a8015598ceda1.zip Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.gz Qt-1ee923a21c270094203c5d2a861a8015598ceda1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/stylesheet.qdoc
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2718,6 +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}" for ARCH in $CFG_MAC_ARCHS_GCC_FORMAT; do MAC_ARCHS_COMMANDLINE="$MAC_ARCHS_COMMANDLINE -arch $ARCH" done |