summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-04-14 07:30:15 (GMT)
committerMorten Sørvig <msorvig@trolltech.com>2009-04-14 07:30:15 (GMT)
commit1c4f8069dea405cc80e87548e1e3609611a7bab4 (patch)
tree0a0f10385007084b72115c5ef93ed59abc2e79e4
parent02f4f244f585868dc1cca208f0caa6f02d734d65 (diff)
downloadQt-1c4f8069dea405cc80e87548e1e3609611a7bab4.zip
Qt-1c4f8069dea405cc80e87548e1e3609611a7bab4.tar.gz
Qt-1c4f8069dea405cc80e87548e1e3609611a7bab4.tar.bz2
Allow "i386" as an alias for x86 for Mac universal builds
GCC uses i386, but configure has always used x86, which can lead to confusion. Reviewed-by: nrc
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 6d67dee..adb08a8 100755
--- a/configure
+++ b/configure
@@ -2694,14 +2694,17 @@ fi
# check -arch arguments for validity.
if [ "$PLATFORM_MAC" = "yes" ]; then
- ALLOWED="x86 ppc x86_64 ppc64"
+ ALLOWED="x86 ppc x86_64 ppc64 i386"
for i in $CFG_MAC_ARCHS
do
if echo "$ALLOWED" | grep -w -v "$i" > /dev/null 2>&1; then
- echo "Unknown architecture: \"$i\". Supported architectures: x86 ppc x86_64 ppc64";
+ echo "Unknown architecture: \"$i\". Supported architectures: x86[i386] ppc x86_64 ppc64";
exit 2;
fi
done
+
+# replace "i386" with "x86" to support configuring with -arch i386 as an alias for x86.
+ CFG_MAC_ARCHS="${CFG_MAC_ARCHS/i386/x86}"
fi
# find the default framework value