summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-05-07 07:41:35 (GMT)
committerMorten Sørvig <msorvig@trolltech.com>2009-05-07 07:41:35 (GMT)
commit0d8434ecfec5a088bc0c755964dae1dfcb35305e (patch)
tree439b859a3f9b83187553843f8be62862966191d1
parenta83d4edbb27ca5394e97de6387f9bdc1fc0d98ae (diff)
downloadQt-0d8434ecfec5a088bc0c755964dae1dfcb35305e.zip
Qt-0d8434ecfec5a088bc0c755964dae1dfcb35305e.tar.gz
Qt-0d8434ecfec5a088bc0c755964dae1dfcb35305e.tar.bz2
Fix configure error on Mac with "-arch x86"
STRING="${STRING/x86/i386}" actually replaces whole words only, so we don't need to fixup x86_64 afterwards. Reviewed-by: nrc
-rwxr-xr-xconfigure1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure b/configure
index 20bf457..bd77174 100755
--- a/configure
+++ b/configure
@@ -2717,7 +2717,6 @@ 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