From 6172ebaf301c42b0c87396a9c6f0816081dddef9 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 26 Oct 2016 13:48:37 +0200 Subject: Fix compiler version detection for clang Concatenate the multi line output from clang into one line before parsing it. This got broken in 492d7d14fc. Change-Id: I282d69932c5851f229213d7ef1ca6a78cd56c8c3 Reviewed-by: Friedemann Kleint Reviewed-by: Michal Klocek Reviewed-by: Oswald Buddenhagen --- configure.pri | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.pri b/configure.pri index cdc13ff87c..6d318f63cb 100644 --- a/configure.pri +++ b/configure.pri @@ -225,6 +225,7 @@ defineTest(qtConfTest_buildParts) { defineTest(qtConfTest_checkCompiler) { contains(QMAKE_CXX, ".*clang.*") { qtRunLoggedCommand("$$QMAKE_CXX -v 2>&1", versionstr)|return(false) + versionstr = "$$versionstr" contains(versionstr, "^Apple (clang|LLVM) version .*") { $${1}.compilerDescription = "Apple Clang" $${1}.compilerId = "apple_clang" -- cgit v1.2.3