mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-05 22:53:13 +02:00
Code Issues Wiki Activity

Tolerate lldb-mi installations without lldb

Browse source 
We avoid attempting to invoke lldb when we know it does not exist to
reduce noise in the error log.
This commit is contained in:
John Dallaway 2025-07-10 15:28:04 +01:00
parent b29198a8ac
commit f72057e622
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2016 Ericsson. * Copyright (c) 2016, 2025 Ericsson and others.
* *
* This program and the accompanying materials * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0 * are made available under the terms of the Eclipse Public License 2.0
@ -7,6 +7,9 @@
* https://www.eclipse.org/legal/epl-2.0/ * https://www.eclipse.org/legal/epl-2.0/
* *
* SPDX-License-Identifier: EPL-2.0 * SPDX-License-Identifier: EPL-2.0
* Contributors:
* Ericsson - Initial implementation
* John Dallaway - Tolerate lldb-mi installations without lldb (#1186)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.llvm.dsf.lldb.core.internal.launching; package org.eclipse.cdt.llvm.dsf.lldb.core.internal.launching;
@ -161,7 +164,11 @@ public class LLDBLaunch extends GdbLaunch {
lastSegment = lastSegment.replace(ILLDBConstants.LLDB_MI_EXECUTABLE_NAME, lastSegment = lastSegment.replace(ILLDBConstants.LLDB_MI_EXECUTABLE_NAME,
ILLDBConstants.LLDB_EXECUTABLE_NAME); ILLDBConstants.LLDB_EXECUTABLE_NAME);
} }
boolean isLldbMiAbsolute = lldbMiPath.isAbsolute() && lldbMiPath.toFile().exists();
lldbMiPath = lldbMiPath.removeLastSegments(1).append(lastSegment); lldbMiPath = lldbMiPath.removeLastSegments(1).append(lastSegment);
if (isLldbMiAbsolute && !lldbMiPath.toFile().exists()) {
return; // lldb is not found in the containing folder of lldb-mi
}
String cmd = lldbMiPath + " --version"; //$NON-NLS-1$ String cmd = lldbMiPath + " --version"; //$NON-NLS-1$