[zorg] r374691 - Changed clang-x86_64-debian-fast builder to use UnifiedTreeBuilder.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Sat Oct 12 19:20:23 2019
New Revision: 374691

URL: http://llvm.org/viewvc/llvm-project?rev=374691&view=rev
Log:
Changed clang-x86_64-debian-fast builder to use UnifiedTreeBuilder.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=374691&r1=374690&r2=374691&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sat Oct 12 19:20:23 2019
@@ -94,17 +94,22 @@ def _get_clang_fast_builders():
         {'name': "clang-x86_64-debian-fast",
          'slavenames':["gribozavr4"],
          'builddir':"clang-x86_64-debian-fast",
-         'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(
-                     withLLD=False,
-                     extraCmakeOptions=[
-                       "-DCOMPILER_RT_BUILD_BUILTINS:BOOL=OFF",
-                       "-DCOMPILER_RT_BUILD_SANITIZERS:BOOL=OFF",
-                       "-DCOMPILER_RT_BUILD_XRAY:BOOL=OFF",
-                       "-DCOMPILER_RT_CAN_EXECUTE_TESTS:BOOL=OFF",
-                       "-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF"],
-                     prefixCommand=None, # This is a designated builder, so no need to be nice.
-                     env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin',
-                         'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes'})},
+         'factory': UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                        llvm_srcdir="llvm.src",
+                        obj_dir="llvm.obj",
+                        depends_on_projects=['llvm','clang','clang-tools-extra','compiler-rt'],
+                        extra_configure_args=[
+                            "-DCOMPILER_RT_BUILD_BUILTINS:BOOL=OFF",
+                            "-DCOMPILER_RT_BUILD_SANITIZERS:BOOL=OFF",
+                            "-DCOMPILER_RT_BUILD_XRAY:BOOL=OFF",
+                            "-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF",
+                            "-DCMAKE_C_FLAGS=-Wdocumentation -Wno-documentation-deprecated-sync",
+                            "-DCMAKE_CXX_FLAGS=-std=c++11 -Wdocumentation -Wno-documentation-deprecated-sync",
+                        ],
+                        env={
+                            'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin',
+                            'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes',
+                        })},
 
         {'name': "llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast",
          'mergeRequests': False,