Skip to content

Commit a685cfd

Browse files
authored
Reland Update the project dependencies for the lldb-remote-linux builders. (#602)
Add additional dependencies with the libc++/libc++abi/libunwind and compiler-rt libraries. Also removed unaffected LLDB_CAN_USE_LLDB_SERVER options.
1 parent 4766b9b commit a685cfd

File tree

1 file changed

+28
-8
lines changed

1 file changed

+28
-8
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3664,7 +3664,20 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
36643664
'workernames': ["as-builder-9"],
36653665
'builddir': "lldb-remote-linux-ubuntu",
36663666
'factory': UnifiedTreeBuilder.getCmakeExBuildFactory(
3667-
depends_on_projects = ["llvm", "clang", "lld", "lldb"],
3667+
depends_on_projects = [
3668+
'llvm',
3669+
'compiler-rt',
3670+
'clang',
3671+
'libunwind',
3672+
'libcxx',
3673+
'libcxxabi',
3674+
'lld',
3675+
'lldb',
3676+
],
3677+
# Allow only these projects with LLVM_ENABLE_PROJECTS.
3678+
enable_projects = ["llvm", "clang", "lld", "lldb"],
3679+
# Use a proper list of runtimes (LLVM_ENABLE_RUNTIMES) from CrossWinToARMLinux.cmake.
3680+
# Avoid making it from a list of the depended projects.
36683681
enable_runtimes = None,
36693682
checks = [
36703683
"check-lldb-unit",
@@ -3702,9 +3715,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
37023715
"LLDB_ENABLE_CURSES" : "OFF",
37033716
"LLDB_ENABLE_LZMA" : "OFF",
37043717
"LLDB_ENABLE_LIBXML2" : "OFF",
3705-
# No need to build lldb-server during the first stage.
3706-
# We are going to build it for the target platform later.
3707-
"LLDB_CAN_USE_LLDB_SERVER" : "OFF",
37083718
"LLDB_TEST_USER_ARGS" : util.Interpolate(
37093719
"--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
37103720
"--platform-name;remote-linux;" \
@@ -3793,7 +3803,20 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
37933803
'workernames': ["as-builder-10"],
37943804
'builddir': "lldb-x-aarch64",
37953805
'factory': UnifiedTreeBuilder.getCmakeExBuildFactory(
3796-
depends_on_projects = ["llvm", "clang", "lld", "lldb"],
3806+
depends_on_projects = [
3807+
'llvm',
3808+
'compiler-rt',
3809+
'clang',
3810+
'libunwind',
3811+
'libcxx',
3812+
'libcxxabi',
3813+
'lld',
3814+
'lldb',
3815+
],
3816+
# Allow only these projects with LLVM_ENABLE_PROJECTS.
3817+
enable_projects = ["llvm", "clang", "lld", "lldb"],
3818+
# Use a proper list of runtimes (LLVM_ENABLE_RUNTIMES) from CrossWinToARMLinux.cmake.
3819+
# Avoid making it from a list of the depended projects.
37973820
enable_runtimes = None,
37983821
checks = [
37993822
"check-lldb-unit",
@@ -3830,9 +3853,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
38303853
"LLDB_ENABLE_CURSES" : "OFF",
38313854
"LLDB_ENABLE_LZMA" : "OFF",
38323855
"LLDB_ENABLE_LIBXML2" : "OFF",
3833-
# No need to build lldb-server during the first stage.
3834-
# We are going to build it for the target platform later.
3835-
"LLDB_CAN_USE_LLDB_SERVER" : "OFF",
38363856
"LLDB_TEST_USER_ARGS" : util.Interpolate(
38373857
"--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
38383858
"--platform-name;remote-linux;" \

0 commit comments

Comments
 (0)