From d7f68ba17449babadfa12437d4fbe31f29d902b9 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 8 Dec 2021 13:39:38 +0200 Subject: [PATCH] Fix LLVM tools version query On Debian clang tools are prefixed with "Debian ": $ clang-tidy --version Debian LLVM version 13.0.0 Optimized build. Default target: x86_64-pc-linux-gnu Host CPU: bdver2 Change-Id: I03886d2674a3851c0cf391afc1c1672b0349184e Reviewed-by: Reviewed-by: Christian Stenger --- src/plugins/clangtools/executableinfo.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp index 593615ec1f8..45b2ea8e2cc 100644 --- a/src/plugins/clangtools/executableinfo.cpp +++ b/src/plugins/clangtools/executableinfo.cpp @@ -228,8 +228,9 @@ QString queryVersion(const FilePath &clangToolPath, QueryFailMode failMode) static const QStringList versionPrefixes{"LLVM version ", "clang version: "}; const QString line = stream.readLine().simplified(); for (const QString &prefix : versionPrefixes) { - if (line.startsWith(prefix)) - return line.mid(prefix.length()); + auto idx = line.indexOf(prefix); + if (idx >= 0) + return line.mid(idx + prefix.length()); } } return {};