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

Debugger: Start lldb-server instead of gdbserver

Browse Source 
... when the debug server looks like lldb-sever.
Also use suitable arguments.

Needed for setting up device connection later.

Change-Id: Ie4130be7881e12d460ab5116b0018916d47ed012
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-04-02 12:09:45 +02:00
parent aec5563364
commit fb784a1f80
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1103,6 +1103,13 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
if (debugServer.executable.isEmpty()) if (debugServer.executable.isEmpty())
debugServer.executable = FilePath::fromString("gdbserver"); debugServer.executable = FilePath::fromString("gdbserver");
args.clear(); args.clear();
if (debugServer.executable.toString().contains("lldb-server")) {
args.append("platform");
args.append("--listen");
args.append(QString("*:%1").arg(portsGatherer->gdbServer().port()));
args.append("--server");
} else {
// Something resembling gdbserver
if (m_useMulti) if (m_useMulti)
args.append("--multi"); args.append("--multi");
if (m_pid.isValid()) if (m_pid.isValid())
@@ -1111,6 +1118,7 @@ DebugServerRunner::DebugServerRunner(RunControl *runControl, DebugServerPortsGat
if (m_pid.isValid()) if (m_pid.isValid())
args.append(QString::number(m_pid.pid())); args.append(QString::number(m_pid.pid()));
} }
}
debugServer.commandLineArguments = QtcProcess::joinArgs(args, OsTypeLinux); debugServer.commandLineArguments = QtcProcess::joinArgs(args, OsTypeLinux);
doStart(debugServer, runControl->device()); doStart(debugServer, runControl->device());