From dbd7ca36582ff705675d52d5761b05cad9acb0f5 Mon Sep 17 00:00:00 2001 From: Galina Kistanova Date: Tue, 22 Oct 2019 04:46:04 +0000 Subject: Removed dependency on compiler-rt for llvm-clang-lld-x86_64-scei-ps4-* builders. git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@375481 91177308-0d34-0410-b5e6-96231b3b80d8 --- buildbot/osuosl/master/config/builders.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py index 8f559581..90bfddf9 100644 --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -117,15 +117,10 @@ def _get_clang_fast_builders(): 'slavenames': ["ps4-buildslave4"], 'builddir': "llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast", 'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory( - depends_on_projects=['llvm','clang','clang-tools-extra','compiler-rt','lld'], + depends_on_projects=['llvm','clang','clang-tools-extra','lld'], extra_configure_args=[ "-DCMAKE_C_COMPILER=clang", "-DCMAKE_CXX_COMPILER=clang++", - "-DCOMPILER_RT_BUILD_BUILTINS=OFF", - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF", - "-DCOMPILER_RT_CAN_EXECUTE_TESTS=OFF", - "-DCOMPILER_RT_INCLUDE_TESTS=OFF", - "-DLLVM_TOOL_COMPILER_RT_BUILD=OFF", # TODO: Check why we depend on compiler-rt then? "-DLLVM_BUILD_TESTS=ON", "-DLLVM_BUILD_EXAMPLES=ON", "-DCLANG_BUILD_EXAMPLES=ON", @@ -142,9 +137,8 @@ def _get_clang_fast_builders(): 'builddir': "llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast", 'factory': UnifiedTreeBuilder.getCmakeWithNinjaWithMSVCBuildFactory( vs="autodetect", - depends_on_projects=['llvm','clang','clang-tools-extra','compiler-rt','lld'], + depends_on_projects=['llvm','clang','clang-tools-extra','lld'], extra_configure_args=[ - "-DLLVM_TOOL_COMPILER_RT_BUILD=OFF", # TODO: Check why we depend on compiler-rt then? "-DLLVM_BUILD_TESTS=ON", "-DLLVM_BUILD_EXAMPLES=ON", "-DCLANG_BUILD_EXAMPLES=ON", -- cgit v1.2.3