diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py --- a/buildbot/osuosl/master/config/builders.py +++ b/buildbot/osuosl/master/config/builders.py @@ -622,15 +622,10 @@ 'tags' : ["clang", "ppc", "ppc64le"], 'workernames' : ["ppc64le-clang-rhel-test"], 'builddir': "clang-ppc64le-rhel", - 'factory' : ClangBuilder.getClangCMakeBuildFactory(clean=False, - checkout_clang_tools_extra=True, - checkout_compiler_rt=False, - checkout_lld=True, - checkout_libcxx=False, - useTwoStage=False, - runTestSuite=True, - stage1_config='Release', - nt_flags=['--threads=16', '--build-threads=16'], + 'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory( + depends_on_projects=["llvm"], + clean=True, + checks="check", extra_cmake_args=[ '-DLLVM_ENABLE_PROJECTS=clang;llvm;clang-tools-extra;lld', '-DLLVM_ENABLE_RUNTIMES=compiler-rt', @@ -640,6 +635,7 @@ "-DCMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN:PATH=/opt/rh/devtoolset-7/root/usr", "-DCMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN:PATH=/opt/rh/devtoolset-7/root/usr", "-DLLVM_BINUTILS_INCDIR=/usr/include", "-DBUILD_SHARED_LIBS=ON", "-DLLVM_ENABLE_WERROR=ON", + "-DCMAKE_BUILD_TYPE=Release", '-DLLVM_LIT_ARGS=-vj 20'])}, {'name' : "clang-ppc64-aix-ppc64le",