summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-08-20 17:52:49 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-08-29 15:25:31 +0200
commit93c137ea29f011a267e22fa644a40aba6e3e2d22 (patch)
tree87c55354111fde07d9d4e431e3f44696cbb9275d /configure
parent3633f35a607872108fdc3ce06914f7d42a4facdf (diff)
downloadqt4-tools-93c137ea29f011a267e22fa644a40aba6e3e2d22.tar.gz
Fix AArch64/arm64 detection.
The detection needs to go before arm, else the system will detect AArch64/arm64 as arm. This patch comes from Wookey, he has agreed to put it under BSD or Expat to allow it's inclusion in here: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735488#255> Change-Id: Ic2171c03fca8bb871347940fa3a2bc467776f797 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index ea7cc088f5..f3a800a617 100755
--- a/configure
+++ b/configure
@@ -3241,17 +3241,17 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
fi
CFG_HOST_ARCH=s390
;;
- *:*:arm*)
+ *:*:aarch64*|*:*:arm64*)
if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " ARM (arm)"
+ echo " AArch64 (aarch64)"
fi
- CFG_HOST_ARCH=arm
+ CFG_HOST_ARCH=aarch64
;;
- *:*:aarch64*)
+ *:*:arm*)
if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " AArch64 (aarch64)"
+ echo " ARM (arm)"
fi
- CFG_HOST_ARCH=aarch64
+ CFG_HOST_ARCH=arm
;;
Linux:*:sparc*)
if [ "$OPT_VERBOSE" = "yes" ]; then