feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Start debugserver for remote macOS

Browse Source 
Change-Id: I5f713892dfbaaaecb7459c288df109bfe337f891
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-04-06 06:58:39 +02:00
parent 522de9bfd7
commit 3cd5e32e9c
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -1039,14 +1039,37 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
cmd.setExecutable(commandLine().executable()); // FIXME: Case should not happen? cmd.setExecutable(commandLine().executable()); // FIXME: Case should not happen?
} else { } else {
cmd.setExecutable(runControl->device()->debugServerPath()); cmd.setExecutable(runControl->device()->debugServerPath());
if (cmd.isEmpty())
cmd.setExecutable(runControl->device()->filePath("gdbserver")); if (cmd.isEmpty()) {
if (runControl->device()->osType() == Utils::OsTypeMac) {
const FilePath debugServerLocation = runControl->device()->filePath(
"/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/"
"Resources/debugserver");
if (debugServerLocation.isExecutableFile()) {
cmd.setExecutable(debugServerLocation);
} else {
// TODO: In the future it is expected that the debugserver will be
// replaced by lldb-server. Remove the check for debug server at that point.
const FilePath lldbserver
= runControl->device()->filePath("lldb-server").searchInPath();
if (lldbserver.isExecutableFile())
cmd.setExecutable(lldbserver);
}
} else {
cmd.setExecutable(runControl->device()->filePath("gdbserver"));
}
}
args.clear(); args.clear();
if (cmd.executable().toString().contains("lldb-server")) { if (cmd.executable().baseName().contains("lldb-server")) {
args.append("platform"); args.append("platform");
args.append("--listen"); args.append("--listen");
args.append(QString("*:%1").arg(portsGatherer->gdbServer().port())); args.append(QString("*:%1").arg(portsGatherer->gdbServer().port()));
args.append("--server"); args.append("--server");
} else if (cmd.executable().baseName() == "debugserver") {
args.append(QString("*:%1").arg(portsGatherer->gdbServer().port()));
args.append("--attach");
args.append(QString::number(m_pid.pid()));
} else { } else {
// Something resembling gdbserver // Something resembling gdbserver
if (m_useMulti) if (m_useMulti)