[Lldb-commits] [lldb] [lldb][rpc] Add sysroot to lldb-rpc-gen test suite invocation (PR #151291)

[Chelsea Cassanova via lldb-commits]

https://github.com/chelcassanova updated https://github.com/llvm/llvm-project/pull/151291

>From 40260f72bd61ab6d0b6b059b3c3ae68766d37479 Mon Sep 17 00:00:00 2001
From: Chelsea Cassanova <chelsea_cassanova at apple.com>
Date: Wed, 30 Jul 2025 00:56:06 -0700
Subject: [PATCH] [lldb][rpc] Add sysroot to lldb-rpc-gen test suite invocation

When running the lldb-rpc-gen tests On Darwin platforms, the sysroot
needs to be added to the test invocation. Without it, basic includes
will not be resolved and the test will fail.
---
 lldb/test/Shell/helper/toolchain.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lldb/test/Shell/helper/toolchain.py b/lldb/test/Shell/helper/toolchain.py
index 728f6347242f1..d12f00ef9ccc9 100644
--- a/lldb/test/Shell/helper/toolchain.py
+++ b/lldb/test/Shell/helper/toolchain.py
@@ -119,6 +119,17 @@ def use_lldb_substitutions(config):
 
     lldb_init = _get_lldb_init_path(config)
 
+    sysroot_arg = ""
+    if platform.system() in ["Darwin"]:
+        try:
+            out = subprocess.check_output(["xcrun", "--show-sdk-path"]).strip()
+            res = 0
+        except OSError:
+            res = -1
+        if res == 0 and out:
+            sdk_path = lit.util.to_string(out)
+            sysroot_arg = '--extra-arg="--sysroot=' + sdk_path + '"'
+
     primary_tools = [
         ToolSubst(
             "%lldb",
@@ -163,6 +174,7 @@ def use_lldb_substitutions(config):
             extra_args=[
                 "-p " + config.lldb_build_directory + "/..",
                 '--extra-arg="-resource-dir=' + config.clang_resource_dir + '"',
+                sysroot_arg,
             ],
             unresolved="ignore",
         ),