Skip to content

Commit 472e6bf

Browse files
authored
Build latest cross Clang during 1st stage of the LLDB remote-linux builder. (#276)
Build the latest Aarch64 cross toolchain including all required libraries & etc to build the lldb-server and the tests.
1 parent 3406428 commit 472e6bf

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3315,20 +3315,23 @@
33153315
"CMAKE_BUILD_TYPE" : "Release",
33163316
"CMAKE_C_COMPILER_LAUNCHER" : "ccache",
33173317
"CMAKE_CXX_COMPILER_LAUNCHER" : "ccache",
3318-
"CMAKE_C_COMPILER" : "clang-19",
3319-
"CMAKE_CXX_COMPILER" : "clang++-19",
33203318
"CMAKE_CXX_FLAGS" : "-D__OPTIMIZE__",
33213319
"LLVM_TARGETS_TO_BUILD" : "AArch64",
3322-
"LLVM_DEFAULT_TARGET_TRIPLE" : "aarch64-unknown-linux-gnu",
33233320
#Note: needs for some LLDB tests.
33243321
"LLVM_TARGET_TRIPLE" : "aarch64-unknown-linux-gnu",
33253322
"LLVM_INCLUDE_BENCHMARKS" : "OFF",
33263323
"LLVM_PARALLEL_LINK_JOBS" : 8,
33273324
"CLANG_DEFAULT_LINKER" : "lld",
33283325
"LLVM_LIT_ARGS" : "-v -vv --threads=8",
33293326

3327+
"TOOLCHAIN_TARGET_TRIPLE" : "aarch64-unknown-linux-gnu",
3328+
"TOOLCHAIN_TARGET_COMPILER_FLAGS" : "-mcpu=cortex-a78",
3329+
"TOOLCHAIN_TARGET_SYSROOTFS" : "/mnt/fs/jetson-orin-ubuntu",
3330+
"LIBCXX_ABI_VERSION" : "1",
3331+
"LLVM_INSTALL_TOOLCHAIN_ONLY" : "OFF",
3332+
33303333
"LLDB_TEST_ARCH" : "aarch64",
3331-
"LLDB_TEST_COMPILER" : util.Interpolate("%(prop:tools_root_path)s/aarch64-clang-19/bin/clang"),
3334+
"LLDB_TEST_COMPILER" : util.Interpolate("%(prop:builddir)s/build/bin/clang"),
33323335
"LLDB_TEST_PLATFORM_URL" : util.Interpolate("connect://%(prop:remote_test_host)s:1234"),
33333336
"LLDB_TEST_PLATFORM_WORKING_DIR": "/home/ubuntu/lldb-tests",
33343337
"LLDB_TEST_SYSROOT" : util.Interpolate("%(prop:sysroot_path_aarch64)s"),
@@ -3345,8 +3348,9 @@
33453348
"--env;ARCH_CFLAGS=-mcpu=cortex-a78;" \
33463349
"--platform-name;remote-linux"),
33473350
},
3348-
cmake_options = {
3349-
},
3351+
cmake_options = [
3352+
"-C", util.Interpolate("%(prop:srcdir_relative)s/clang/cmake/caches/CrossWinToARMLinux.cmake"),
3353+
],
33503354
install_dir = "native",
33513355
post_build_steps =
33523356
# Stage 2.
@@ -3367,9 +3371,9 @@
33673371
"CMAKE_C_FLAGS" : "-mcpu=cortex-a78 -D__OPTIMIZE__ -fPIC",
33683372
"CMAKE_EXE_LINKER_FLAGS" : "-Wl,-l:libc++abi.a -Wl,-l:libc++.a -Wl,-l:libunwind.a",
33693373
"CMAKE_SHARED_LINKER_FLAGS" : "-Wl,-l:libc++abi.a -Wl,-l:libc++.a -Wl,-l:libunwind.a",
3370-
"CMAKE_CXX_COMPILER" : util.Interpolate("%(prop:tools_root_path)s/aarch64-clang-19/bin/clang++"),
3371-
"CMAKE_C_COMPILER" : util.Interpolate("%(prop:tools_root_path)s/aarch64-clang-19/bin/clang"),
3372-
"CMAKE_ASM_COMPILER" : util.Interpolate("%(prop:tools_root_path)s/aarch64-clang-19/bin/clang"),
3374+
"CMAKE_CXX_COMPILER" : util.Interpolate("%(prop:builddir)s/build/bin/clang++"),
3375+
"CMAKE_C_COMPILER" : util.Interpolate("%(prop:builddir)s/build/bin/clang"),
3376+
"CMAKE_ASM_COMPILER" : util.Interpolate("%(prop:builddir)s/build/bin/clang"),
33733377
"CMAKE_SYSTEM_NAME" : "Linux",
33743378
"CMAKE_SYSTEM_PROCESSOR" : "aarch64",
33753379
"CMAKE_CROSSCOMPILING" : "ON",

0 commit comments

Comments
 (0)