Skip to content

Commit 3d0b820

Browse files
committed
Revert "Update the project dependencies for the lldb-remote-linux builders." (llvm#588)
Reverts llvm#574 Causes failures during the configuration step for the lldb-remote-linux-* builders.
1 parent bd41888 commit 3d0b820

File tree

1 file changed

+8
-28
lines changed

1 file changed

+8
-28
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,20 +3657,7 @@
36573657
'workernames': ["as-builder-9"],
36583658
'builddir': "lldb-remote-linux-ubuntu",
36593659
'factory': UnifiedTreeBuilder.getCmakeExBuildFactory(
3660-
depends_on_projects = [
3661-
'llvm',
3662-
'compiler-rt',
3663-
'clang',
3664-
'libunwind',
3665-
'libcxx',
3666-
'libcxxabi',
3667-
'lld',
3668-
'lldb',
3669-
],
3670-
# Allow only these projects with LLVM_ENABLE_PROJECTS.
3671-
enable_projects = ["llvm", "clang", "lld", "lldb"],
3672-
# Use a proper list of runtimes (LLVM_ENABLE_RUNTIMES) from CrossWinToARMLinux.cmake.
3673-
# Avoid making it from a list of the depended projects.
3660+
depends_on_projects = ["llvm", "clang", "lld", "lldb"],
36743661
enable_runtimes = None,
36753662
checks = [
36763663
"check-lldb-unit",
@@ -3708,6 +3695,9 @@
37083695
"LLDB_ENABLE_CURSES" : "OFF",
37093696
"LLDB_ENABLE_LZMA" : "OFF",
37103697
"LLDB_ENABLE_LIBXML2" : "OFF",
3698+
# No need to build lldb-server during the first stage.
3699+
# We are going to build it for the target platform later.
3700+
"LLDB_CAN_USE_LLDB_SERVER" : "OFF",
37113701
"LLDB_TEST_USER_ARGS" : util.Interpolate(
37123702
"--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
37133703
"--platform-name;remote-linux;" \
@@ -3796,20 +3786,7 @@
37963786
'workernames': ["as-builder-10"],
37973787
'builddir': "lldb-x-aarch64",
37983788
'factory': UnifiedTreeBuilder.getCmakeExBuildFactory(
3799-
depends_on_projects = [
3800-
'llvm',
3801-
'compiler-rt',
3802-
'clang',
3803-
'libunwind',
3804-
'libcxx',
3805-
'libcxxabi',
3806-
'lld',
3807-
'lldb',
3808-
],
3809-
# Allow only these projects with LLVM_ENABLE_PROJECTS.
3810-
enable_projects = ["llvm", "clang", "lld", "lldb"],
3811-
# Use a proper list of runtimes (LLVM_ENABLE_RUNTIMES) from CrossWinToARMLinux.cmake.
3812-
# Avoid making it from a list of the depended projects.
3789+
depends_on_projects = ["llvm", "clang", "lld", "lldb"],
38133790
enable_runtimes = None,
38143791
checks = [
38153792
"check-lldb-unit",
@@ -3846,6 +3823,9 @@
38463823
"LLDB_ENABLE_CURSES" : "OFF",
38473824
"LLDB_ENABLE_LZMA" : "OFF",
38483825
"LLDB_ENABLE_LIBXML2" : "OFF",
3826+
# No need to build lldb-server during the first stage.
3827+
# We are going to build it for the target platform later.
3828+
"LLDB_CAN_USE_LLDB_SERVER" : "OFF",
38493829
"LLDB_TEST_USER_ARGS" : util.Interpolate(
38503830
"--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
38513831
"--platform-name;remote-linux;" \

0 commit comments

Comments
 (0)