summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-05-21 04:08:02 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-05-21 04:08:02 (GMT)
commit2cb36aed053147ecc91f72ed76074962a66b76f0 (patch)
tree92042e2dd517a6602130183a98edad77b506f070 /configure
parentd94ed47b7748826fc2b9fba774cce51a54c24880 (diff)
downloadQt-2cb36aed053147ecc91f72ed76074962a66b76f0.zip
Qt-2cb36aed053147ecc91f72ed76074962a66b76f0.tar.gz
Qt-2cb36aed053147ecc91f72ed76074962a66b76f0.tar.bz2
Fix build regression caused by ba5fb9f05c891feac8ab69006189de1aaafebc18.
The previous "fix" caused the effect of the line before the change to be discarded, which breaks the mac binary package builds. When reviewing changes, please read the lines of context given in the patch - they are included for a reason. Acked-by: Lincoln Ramsay Acked-by: Rohan McGovern
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 20bf457..c882b29 100755
--- a/configure
+++ b/configure
@@ -2717,7 +2717,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