From f77a3d04eb61a03739473151dca8274fd5f4217f Mon Sep 17 00:00:00 2001
From: Vladimir Vereschaka <vvereschaka@accesssoftek.com>
Date: Mon, 25 Aug 2025 21:32:54 -0700
Subject: [PATCH] Update the project dependencies for the lldb-remote-linux
 builders.

Add additional dependencies with the libc++/libc++abi/libunwind and
compiler-rt libraries.

Also removed unaffected LLDB_CAN_USE_LLDB_SERVER options.
---
 buildbot/osuosl/master/config/builders.py | 28 ++++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index b92c48e76..0b91ece79 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -3640,7 +3640,16 @@
     'workernames': ["as-builder-9"],
     'builddir': "lldb-remote-linux-ubuntu",
     'factory': UnifiedTreeBuilder.getCmakeExBuildFactory(
-                    depends_on_projects = ["llvm", "clang", "lld", "lldb"],
+                    depends_on_projects = [
+                        'llvm',
+                        'compiler-rt',
+                        'clang',
+                        'libunwind',
+                        'libcxx',
+                        'libcxxabi',
+                        'lld',
+                        'lldb',
+                    ],
                     enable_runtimes = None,
                     checks = [
                         "check-lldb-unit",
@@ -3678,9 +3687,6 @@
                         "LLDB_ENABLE_CURSES"            : "OFF",
                         "LLDB_ENABLE_LZMA"              : "OFF",
                         "LLDB_ENABLE_LIBXML2"           : "OFF",
-                        # No need to build lldb-server during the first stage.
-                        # We are going to build it for the target platform later.
-                        "LLDB_CAN_USE_LLDB_SERVER"      : "OFF",
                         "LLDB_TEST_USER_ARGS"           : util.Interpolate(
                                                             "--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
                                                             "--platform-name;remote-linux;" \
@@ -3769,7 +3775,16 @@
     'workernames': ["as-builder-10"],
     'builddir': "lldb-x-aarch64",
     'factory': UnifiedTreeBuilder.getCmakeExBuildFactory(
-                    depends_on_projects = ["llvm", "clang", "lld", "lldb"],
+                    depends_on_projects = [
+                        'llvm',
+                        'compiler-rt',
+                        'clang',
+                        'libunwind',
+                        'libcxx',
+                        'libcxxabi',
+                        'lld',
+                        'lldb',
+                    ],
                     enable_runtimes = None,
                     checks = [
                         "check-lldb-unit",
@@ -3806,9 +3821,6 @@
                         "LLDB_ENABLE_CURSES"            : "OFF",
                         "LLDB_ENABLE_LZMA"              : "OFF",
                         "LLDB_ENABLE_LIBXML2"           : "OFF",
-                        # No need to build lldb-server during the first stage.
-                        # We are going to build it for the target platform later.
-                        "LLDB_CAN_USE_LLDB_SERVER"      : "OFF",
                         "LLDB_TEST_USER_ARGS"           : util.Interpolate(
                                                             "--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
                                                             "--platform-name;remote-linux;" \