From 79010891e16df95e82d98c72dc4b07234e02f069 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 7 Sep 2020 12:03:10 +0200 Subject: [PATCH] Debugger: Drop clang and llvm revision from LLDB version number They are mentioned as separate lines in the lldb --version output for self-build lldb binaries. Change-Id: Ib0d6e46874ad5b576ac20a6aeab823d51571c0f2 Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggeritem.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index 819c7e615af..d9762fcefb5 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -224,12 +224,14 @@ void DebuggerItem::reinitializeFromFile() m_abis = Abi::abisOfBinary(m_command); // Version - if (output.startsWith(("lldb version "))) { // Linux typically. + // Self-build binaries also emit clang and llvm revision. + const QString line = output.split('\n')[0]; + if (line.startsWith(("lldb version "))) { // Linux typically. int pos1 = int(strlen("lldb version ")); - int pos2 = output.indexOf(' ', pos1); - m_version = output.mid(pos1, pos2 - pos1); - } else if (output.startsWith("lldb-") || output.startsWith("LLDB-")) { // Mac typically. - m_version = output.mid(5); + int pos2 = line.indexOf(' ', pos1); + m_version = line.mid(pos1, pos2 - pos1); + } else if (line.startsWith("lldb-") || line.startsWith("LLDB-")) { // Mac typically. + m_version = line.mid(5); } return; }