Skip to content
This repository was archived by the owner on Mar 25, 2019. It is now read-only.

Commit a41bdc2

Browse files
committed
Next CLion support - GDB location
1 parent 581a559 commit a41bdc2

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/xyz/elmot/clion/openocd/OpenOcdLauncher.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.jetbrains.cidr.cpp.toolchains.CPPDebugger;
2525
import com.jetbrains.cidr.cpp.toolchains.CPPToolchains;
2626
import com.jetbrains.cidr.execution.debugger.CidrDebugProcess;
27+
import com.jetbrains.cidr.execution.debugger.CidrDebuggerPathManager;
2728
import com.jetbrains.cidr.execution.debugger.backend.DebuggerCommandException;
2829
import com.jetbrains.cidr.execution.debugger.backend.DebuggerDriver;
2930
import com.jetbrains.cidr.execution.debugger.remote.CidrRemoteDebugParameters;
@@ -98,10 +99,7 @@ protected CidrDebugProcess createDebugProcess(@NotNull CommandLineState commandL
9899
String gdbPath;
99100
if (ocdSettings.shippedGdb) {
100101
toolchain = toolchain.copy();
101-
File gdbFile = PathManager.findBinFile("gdb/bin/gdb" + (OS.isWindows() ? ".exe" : ""));
102-
if (gdbFile == null) {
103-
throw new ExecutionException("Shipped gdb is not found. Please check your CLion install");
104-
}
102+
File gdbFile = CidrDebuggerPathManager.getBundledGDBBinary();
105103
gdbPath = gdbFile.getAbsolutePath();
106104
CPPDebugger cppDebugger = CPPDebugger.create(CPPDebugger.Kind.CUSTOM_GDB, gdbPath);
107105
toolchain.setDebugger(cppDebugger);

0 commit comments

Comments
 (0)