summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorIan <IanFromAfrica@yahoo.co.uk>2011-06-08 10:34:42 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-06-20 06:06:53 (GMT)
commit47e6c8bc62d4264ac149f5f063bb8741dbe25def (patch)
treed8444f7f23141ec78ba71cbc030875dee1180629 /configure
parentdc80dfd80ce83ca32f7a6e1a3880d46d1004c573 (diff)
downloadQt-47e6c8bc62d4264ac149f5f063bb8741dbe25def.zip
Qt-47e6c8bc62d4264ac149f5f063bb8741dbe25def.tar.gz
Qt-47e6c8bc62d4264ac149f5f063bb8741dbe25def.tar.bz2
Adding arm armv6 and armv7 as valid archs for mac builds
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index c05ac33..e113217 100755
--- a/configure
+++ b/configure
@@ -3272,14 +3272,14 @@ fi
# process CFG_MAC_ARCHS
if [ "$PLATFORM_MAC" = "yes" ]; then
# check -arch arguments for validity.
- ALLOWED="x86 ppc x86_64 ppc64 i386"
+ ALLOWED="x86 ppc x86_64 ppc64 i386 arm armv6 armv7"
# Save the list so we can re-write it using only valid values
CFG_MAC_ARCHS_IN="$CFG_MAC_ARCHS"
CFG_MAC_ARCHS=
for i in $CFG_MAC_ARCHS_IN
do
if echo "$ALLOWED" | grep -w -v "$i" > /dev/null 2>&1; then
- echo "Unknown architecture: \"$i\". Supported architectures: x86[i386] ppc x86_64 ppc64";
+ echo "Unknown architecture: \"$i\". Supported architectures: x86[i386] ppc x86_64 ppc64 arm armv6 armv7";
exit 2;
fi
if [ "$i" = "i386" -o "$i" = "x86" ]; then