From 70a88331519e6e6439ff23a9cc91b2e3f607acb6 Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Fri, 23 Mar 2012 07:02:47 +0100 Subject: [PATCH] configure: Fix x86_64 detection The regular expression should look for underscores in addition to alphanumeric characters. Change-Id: Idc3dbd67291ec1420f818d74fba8413b1e7cbcf1 Reviewed-by: Girish Ramakrishnan Reviewed-by: Bradley T. Hughes --- configure | 2 +- tools/configure/configureapp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6b2cca4aac..b24787a613 100755 --- a/configure +++ b/configure @@ -3933,7 +3933,7 @@ fi # Build qmake #------------------------------------------------------------------------------- # Use config.tests/arch/arch.pro to has the compiler tell us what the target architecture is -CFG_ARCH=`"$outpath/bin/qmake" -spec "$XQMAKESPEC" -o /dev/null "$relpath/config.tests/arch/arch.pro" 2>&1 | sed -n -e 's,^Project MESSAGE:.*Architecture: \([a-zA-Z0-9]*\).*,\1,p'` +CFG_ARCH=`"$outpath/bin/qmake" -spec "$XQMAKESPEC" -o /dev/null "$relpath/config.tests/arch/arch.pro" 2>&1 | sed -n -e 's,^Project MESSAGE:.*Architecture: \([a-zA-Z0-9_]*\).*,\1,p'` [ -z "$CFG_ARCH" ] && CFG_ARCH="unknown" if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 58ffd28ff3..f47cff6fdd 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2584,7 +2584,7 @@ void Configure::detectArch() if (output.isEmpty()) continue; - QRegExp re("Project MESSAGE:.*Architecture: ([a-zA-Z0-9]*)"); + QRegExp re("Project MESSAGE:.*Architecture: ([a-zA-Z0-9_]*)"); if (re.indexIn(output) != -1) dictionary[key] = re.cap(1); }