From 7942c36ace1e808366f545b2e0da22842c9b1bc5 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 8 Jan 2024 16:57:09 +0100 Subject: [PATCH] Debugger: Fix passing of solib search path Amends 92f7da917ea7e. Also, set it in all branches, not just remote execution, even if this is the primary and currently actively used way. Change-Id: I35149bd29b49dab419f83ec0cb424ae9b23827ed Reviewed-by: Christian Stenger --- src/plugins/debugger/gdb/gdbengine.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 09755f68e6d..70fccf669e1 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4407,6 +4407,13 @@ void GdbEngine::setupInferior() if (rp.breakOnMain) runCommand({"tbreak " + mainFunction()}); + if (!rp.solibSearchPath.isEmpty()) { + DebuggerCommand cmd("appendSolibSearchPath"); + cmd.arg("path", transform(rp.solibSearchPath, &FilePath::path)); + cmd.arg("separator", HostOsInfo::pathListSeparator()); + runCommand(cmd); + } + if (rp.startMode == AttachToRemoteProcess) { handleInferiorPrepared(); @@ -4429,13 +4436,6 @@ void GdbEngine::setupInferior() // if (!remoteArch.isEmpty()) // postCommand("set architecture " + remoteArch); - if (!rp.solibSearchPath.isEmpty()) { - DebuggerCommand cmd("appendSolibSearchPath"); - for (const FilePath &filePath : rp.solibSearchPath) - cmd.arg("path", filePath.path()); - cmd.arg("separator", HostOsInfo::pathListSeparator()); - runCommand(cmd); - } if (!args.isEmpty()) runCommand({"-exec-arguments " + args});