Skip to content

Commit ebcba44

Browse files
authored
Revert "Update the project dependencies for the lldb-remote-linux builders." (#588)
Reverts #574 Causes failures during the configuration step for the lldb-remote-linux-* builders.
1 parent 8e94378 commit ebcba44

File tree

1 file changed

+8
-20
lines changed

1 file changed

+8
-20
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,16 +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-
],
3660+
depends_on_projects = ["llvm", "clang", "lld", "lldb"],
36703661
enable_runtimes = None,
36713662
checks = [
36723663
"check-lldb-unit",
@@ -3704,6 +3695,9 @@
37043695
"LLDB_ENABLE_CURSES" : "OFF",
37053696
"LLDB_ENABLE_LZMA" : "OFF",
37063697
"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",
37073701
"LLDB_TEST_USER_ARGS" : util.Interpolate(
37083702
"--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
37093703
"--platform-name;remote-linux;" \
@@ -3792,16 +3786,7 @@
37923786
'workernames': ["as-builder-10"],
37933787
'builddir': "lldb-x-aarch64",
37943788
'factory': UnifiedTreeBuilder.getCmakeExBuildFactory(
3795-
depends_on_projects = [
3796-
'llvm',
3797-
'compiler-rt',
3798-
'clang',
3799-
'libunwind',
3800-
'libcxx',
3801-
'libcxxabi',
3802-
'lld',
3803-
'lldb',
3804-
],
3789+
depends_on_projects = ["llvm", "clang", "lld", "lldb"],
38053790
enable_runtimes = None,
38063791
checks = [
38073792
"check-lldb-unit",
@@ -3838,6 +3823,9 @@
38383823
"LLDB_ENABLE_CURSES" : "OFF",
38393824
"LLDB_ENABLE_LZMA" : "OFF",
38403825
"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",
38413829
"LLDB_TEST_USER_ARGS" : util.Interpolate(
38423830
"--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
38433831
"--platform-name;remote-linux;" \

0 commit comments

Comments
 (0)