From ef3569d94d120cd51a55138eee892316ca4b352f Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 19 Nov 2024 10:43:04 -0800 Subject: [PATCH] libc: add additional scudo cmake command line options I just rekicked the cmake cache on the buildbots, which are now failing the libc-scudo-integration-test ninja target with linker errors regarding undefined reference to gwp_asan related symbols. --- zorg/buildbot/builders/annotated/libc-linux.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zorg/buildbot/builders/annotated/libc-linux.py b/zorg/buildbot/builders/annotated/libc-linux.py index b865f1787..00ebc3250 100644 --- a/zorg/buildbot/builders/annotated/libc-linux.py +++ b/zorg/buildbot/builders/annotated/libc-linux.py @@ -93,6 +93,9 @@ def main(argv): if fullbuild and not args.asan and not lint_build and not riscv_build: cmake_args.append('-DLLVM_LIBC_INCLUDE_SCUDO=ON') + cmake_args.append('-DCOMPILER_RT_BUILD_SCUDO_STANDALONE_WITH_LLVM_LIBC=ON') + cmake_args.append('-DCOMPILER_RT_BUILD_GWP_ASAN=OFF') + cmake_args.append('-DCOMPILER_RT_SCUDO_STANDALONE_BUILD_SHARED=OFF') cmake_args.append('-DLIBC_INCLUDE_BENCHMARKS=ON') if fullbuild: