diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 13:48:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-07 08:53:27 +0000 |
| commit | 6172ebaf301c42b0c87396a9c6f0816081dddef9 (patch) | |
| tree | 509a328cbcfbfe2aeb21e206954216bae8dc6398 | |
| parent | 68a0bd85920e6eb22b69aa5f57f71f3dccb8b286 (diff) | |
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 <Friedemann.Kleint@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | configure.pri | 1 |
1 files changed, 1 insertions, 0 deletions
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" |