AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Fix x86_64 detection

Browse Source 
The regular expression should look for underscores in addition to
alphanumeric characters.

Change-Id: Idc3dbd67291ec1420f818d74fba8413b1e7cbcf1
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
Bradley T. Hughes 2012-03-23 07:02:47 +01:00 committed by Qt by Nokia
parent 16b7ddde10
commit 70a8833151
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -3933,7 +3933,7 @@ fi # Build qmake
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Use config.tests/arch/arch.pro to has the compiler tell us what the target architecture is # 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" [ -z "$CFG_ARCH" ] && CFG_ARCH="unknown"
if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then

2
tools/configure/configureapp.cpp
View File

@ -2584,7 +2584,7 @@ void Configure::detectArch()
if (output.isEmpty()) if (output.isEmpty())
continue; continue;
QRegExp re("Project MESSAGE:.*Architecture: ([a-zA-Z0-9]*)"); QRegExp re("Project MESSAGE:.*Architecture: ([a-zA-Z0-9_]*)");
if (re.indexIn(output) != -1) if (re.indexIn(output) != -1)
dictionary[key] = re.cap(1); dictionary[key] = re.cap(1);
} }