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 @@ -1701,19 +1701,13 @@ 'tags' : ["sanitizer", "ppc"], 'workernames' : ["ppc64be-sanitizer"], 'builddir': "sanitizer-ppc64be", - 'factory' : SanitizerBuilder.getSanitizerBuildFactory( - timeout=1800, - extra_configure_args=["-DLLVM_CCACHE_BUILD=ON"])}, + 'factory' : SanitizerBuilder.getSanitizerBuildFactory(timeout=1800)}, {'name' : "sanitizer-ppc64le-linux", 'tags' : ["sanitizer", "ppc", "ppc64le"], 'workernames' : ["ppc64le-sanitizer"], 'builddir': "sanitizer-ppc64le", - 'factory' : SanitizerBuilder.getSanitizerBuildFactory( - timeout=1800, - extra_configure_args=[ - "-CMAKE_ARGS='-DLLVM_LIT_ARGS=-v -j256'", - "-DLLVM_CCACHE_BUILD=ON"])}, + 'factory' : SanitizerBuilder.getSanitizerBuildFactory(timeout=1800)}, {'name' : "sanitizer-windows", 'tags' : ["sanitizer"], diff --git a/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh b/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh --- a/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh +++ b/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh @@ -101,6 +101,14 @@ CHECK_MSAN=1 CHECK_TSAN=1 CHECK_SCUDO=1 + CMAKE_COMMON_OPTIONS+=" -DLLVM_TARGETS_TO_BUILD='PowerPC'" + if [[ "$ARCH" == "ppc64le" ]]; then + MAKE_JOBS=256 + CMAKE_COMMON_OPTIONS+=" -DLLVM_LIT_ARGS=-vj256'" + else + MAKE_JOBS=80 + CMAKE_COMMON_OPTIONS+=" -DLLVM_LIT_ARGS=-vj80'" + fi ;; i*86) CHECK_UBSAN=1