Skip to content

Commit df4b4e2

Browse files
[lldb] Use correct path for lldb-server executable
1 parent 616d104 commit df4b4e2

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

lldb/tools/lldb-server/lldb-platform.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
3232
#include "lldb/Host/ConnectionFileDescriptor.h"
3333
#include "lldb/Host/HostGetOpt.h"
34+
#include "lldb/Host/HostInfo.h"
3435
#include "lldb/Host/MainLoop.h"
3536
#include "lldb/Host/OptionParser.h"
3637
#include "lldb/Host/Socket.h"
@@ -256,7 +257,7 @@ static void client_handle(GDBRemoteCommunicationServerPlatform &platform,
256257
printf("Disconnected.\n");
257258
}
258259

259-
static Status spawn_process(const char *progname, const Socket *conn_socket,
260+
static Status spawn_process(const FileSpec &prog, const Socket *conn_socket,
260261
uint16_t gdb_port, const lldb_private::Args &args,
261262
const std::string &log_file,
262263
const StringRef log_channels, MainLoop &main_loop) {
@@ -267,8 +268,7 @@ static Status spawn_process(const char *progname, const Socket *conn_socket,
267268

268269
ProcessLaunchInfo launch_info;
269270

270-
FileSpec self_spec(progname, FileSpec::Style::native);
271-
launch_info.SetExecutableFile(self_spec, true);
271+
launch_info.SetExecutableFile(prog, true);
272272
Args &self_args = launch_info.GetArguments();
273273
self_args.AppendArgument(llvm::StringRef("platform"));
274274
self_args.AppendArgument(llvm::StringRef("--child-platform-fd"));
@@ -547,13 +547,13 @@ int main_platform(int argc, char *argv[]) {
547547
{
548548
llvm::Expected<std::vector<MainLoopBase::ReadHandleUP>> platform_handles =
549549
platform_sock->Accept(
550-
main_loop, [progname, gdbserver_port, &inferior_arguments, log_file,
551-
log_channels, &main_loop,
552-
&platform_handles](std::unique_ptr<Socket> sock_up) {
550+
main_loop,
551+
[gdbserver_port, &inferior_arguments, log_file, log_channels,
552+
&main_loop, &platform_handles](std::unique_ptr<Socket> sock_up) {
553553
printf("Connection established.\n");
554-
Status error = spawn_process(progname, sock_up.get(),
555-
gdbserver_port, inferior_arguments,
556-
log_file, log_channels, main_loop);
554+
Status error = spawn_process(
555+
HostInfo::GetProgramFileSpec(), sock_up.get(), gdbserver_port,
556+
inferior_arguments, log_file, log_channels, main_loop);
557557
if (error.Fail()) {
558558
Log *log = GetLog(LLDBLog::Platform);
559559
LLDB_LOGF(log, "spawn_process failed: %s", error.AsCString());

0 commit comments

Comments
 (0)