https://github.com/yuvald-sweet-security updated
https://github.com/llvm/llvm-project/pull/131609
>From a4e2c9f4fca115cc52ee69abfa584795b7102716 Mon Sep 17 00:00:00 2001
From: Yuval Deutscher <yuvald@sweet.security>
Date: Mon, 17 Mar 2025 14:37:26 +0200
Subject: [PATCH] [lldb] Use correct path for debugserver
---
lldb/tools/lldb-server/SystemInitializerLLGS.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lldb/tools/lldb-server/SystemInitializerLLGS.h
b/lldb/tools/lldb-server/SystemInitializerLLGS.h
index 4469a8ba5f60a..c6020b0dd37da 100644
--- a/lldb/tools/lldb-server/SystemInitializerLLGS.h
+++ b/lldb/tools/lldb-server/SystemInitializerLLGS.h
@@ -11,10 +11,17 @@
#include "lldb/Initialization/SystemInitializer.h"
#include "lldb/Initialization/SystemInitializerCommon.h"
+#include "lldb/Utility/FileSpec.h"
class SystemInitializerLLGS : public lldb_private::SystemInitializerCommon {
public:
- SystemInitializerLLGS() : SystemInitializerCommon(nullptr) {}
+ SystemInitializerLLGS()
+ : SystemInitializerCommon(
+ // Finding the shared libraries directory on lldb-server is broken
+ // since lldb-server isn't dynamically linked with liblldb.so.
+ // Clearing the filespec here causes GetShlibDir to fail and
+ // GetSupportExeDir to fall-back to using the binary path instead.
+ [](lldb_private::FileSpec &file) { file.Clear(); }) {}
llvm::Error Initialize() override;
void Terminate() override;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
