Use LLDB driver for if debugger is LLDB. Fixes
@@ -43,6 +43,7 @@ import com.google.idea.blaze.base.settings.Blaze;
import com.google.idea.blaze.base.settings.BlazeUserSettings;
import com.google.idea.blaze.base.settings.BuildSystem;
import com.google.idea.blaze.clwb.CidrGoogleTestUtilAdapter;
+import com.google.idea.blaze.clwb.ToolchainUtils;
import com.google.idea.blaze.cpp.CppBlazeRules;
import com.google.idea.sdkcompat.clion.GDBDriverConfigurationAdapter;
import com.intellij.execution.ExecutionException;
@@ -61,12 +62,14 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
import com.intellij.xdebugger.XDebugSession;
import com.jetbrains.cidr.cpp.execution.CLionRunParameters;
+import com.jetbrains.cidr.cpp.toolchains.CPPDebugger.Kind;
import com.jetbrains.cidr.cpp.toolchains.CPPToolchains;
import com.jetbrains.cidr.execution.CidrConsoleBuilder;
import com.jetbrains.cidr.execution.TrivialInstaller;
import com.jetbrains.cidr.execution.debugger.CidrDebugProcess;
import com.jetbrains.cidr.execution.debugger.CidrLocalDebugProcess;
import com.jetbrains.cidr.execution.debugger.backend.DebuggerDriverConfiguration;
+import com.jetbrains.cidr.execution.debugger.backend.LLDBDriverConfiguration;
import com.jetbrains.cidr.execution.debugger.remote.CidrRemoteDebugParameters;
import com.jetbrains.cidr.execution.debugger.remote.CidrRemotePathMapping;
import com.jetbrains.cidr.execution.testing.CidrLauncher;
@@ -234,7 +237,10 @@ public final class BlazeCidrLauncher extends CidrLauncher {
ImmutableList<String> startupCommands = getGdbStartupCommands(workspaceRootDirectory);
CLionRunParameters parameters =
new CLionRunParameters(
- new BlazeGDBDriverConfiguration(project, startupCommands, workspaceRoot), installer);
+ ToolchainUtils.getToolchain().getDebuggerKind() == Kind.BUNDLED_LLDB
+ ? new LLDBDriverConfiguration()
+ : new BlazeGDBDriverConfiguration(project, startupCommands, workspaceRoot),
+ installer);
state.setConsoleBuilder(createConsoleBuilder(null));
state.addConsoleFilters(getConsoleFilters().toArray(new Filter[0]));
