Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions buildbot/osuosl/master/config/builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -3664,7 +3664,20 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
'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',
],
# Allow only these projects with LLVM_ENABLE_PROJECTS.
enable_projects = ["llvm", "clang", "lld", "lldb"],
# Use a proper list of runtimes (LLVM_ENABLE_RUNTIMES) from CrossWinToARMLinux.cmake.
# Avoid making it from a list of the depended projects.
enable_runtimes = None,
checks = [
"check-lldb-unit",
Expand Down Expand Up @@ -3702,9 +3715,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
"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;" \
Expand Down Expand Up @@ -3793,7 +3803,20 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
'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',
],
# Allow only these projects with LLVM_ENABLE_PROJECTS.
enable_projects = ["llvm", "clang", "lld", "lldb"],
# Use a proper list of runtimes (LLVM_ENABLE_RUNTIMES) from CrossWinToARMLinux.cmake.
# Avoid making it from a list of the depended projects.
enable_runtimes = None,
checks = [
"check-lldb-unit",
Expand Down Expand Up @@ -3830,9 +3853,6 @@ def collapseRequestsDoxygen(master, builder, req1, req2):
"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;" \
Expand Down