From 4cc9523a3153a0e7b012de3919e0c4f4ccb96265 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Tue, 20 Mar 2012 21:01:20 -0700 Subject: Make architecture detection more robust. Any message/error in mkspecs or qmake feature files ends up confusing the current arch detection logic. Instead, search for "Project MESSAGE: .* Architecture: ". Change-Id: I308932a5b75f3a1fcbc4fe30c74faf2e83b2d752 Reviewed-by: Oswald Buddenhagen --- config.tests/arch/arch.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config.tests/arch/arch.pro') diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro index 108f262a55..ea85a52b97 100644 --- a/config.tests/arch/arch.pro +++ b/config.tests/arch/arch.pro @@ -1,7 +1,7 @@ CONFIG -= qt debug_and_release # Detect target by preprocessing a file that uses Q_PROCESSOR_* macros from qprocessordetection.h COMMAND = $$QMAKE_CXX $$QMAKE_CXXFLAGS -E $$PWD/arch.cpp -# 'false' as second argument to system() prevents qmake from stripping newlines -COMPILER_ARCH = $$system($$COMMAND, false) +# system function converts newline in output into spaces +COMPILER_ARCH = $$system($$COMMAND) # Message back to configure so that it can set QT_ARCH and QT_HOST_ARCH message($$COMPILER_ARCH) -- cgit v1.2.3