Index: zorg/buildbot/builders/sanitizers/buildbot_functions.sh
===================================================================
--- zorg/buildbot/builders/sanitizers/buildbot_functions.sh
+++ zorg/buildbot/builders/sanitizers/buildbot_functions.sh
@@ -17,12 +17,21 @@
         rev_arg="-r$BUILDBOT_REVISION"
     fi
     local tree
-    for tree in llvm llvm/tools/clang llvm/projects/compiler-rt llvm/projects/libcxx llvm/projects/libcxxabi llvm/tools/lld
+    # Currently we do not want to fetch nor build libunwind, libcxx, libcxxabi, and lld on powerpc64 buildbots
+    for tree in llvm llvm/tools/clang llvm/projects/compiler-rt
     do
       if [ -d ${tree} ]; then
         svn cleanup "${tree}"
       fi
     done
+    if [ "$BUILDBOT_BUILDERNAME" != "sanitizer-ppc64-linux1" -a "$BUILDBOT_BUILDERNAME" != "sanitizer-ppc64le-linux" ]; then
+      for tree in llvm llvm/tools/clang llvm/projects/compiler-rt llvm/projects/libcxx llvm/projects/libcxxabi llvm/tools/lld
+      do
+        if [ -d ${tree} ]; then
+          svn cleanup "${tree}"
+        fi
+      done
+    fi 
 
     update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/llvm/trunk llvm
 
@@ -33,10 +42,13 @@
     # XXX: Keep this list in sync with the change filter in buildbot/osuosl/master/master.cfg.
     update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/cfe/trunk llvm/tools/clang
     update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/compiler-rt/trunk llvm/projects/compiler-rt
-    update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libcxx/trunk llvm/projects/libcxx
-    update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libcxxabi/trunk llvm/projects/libcxxabi
-    update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libunwind/trunk llvm/projects/libunwind
-    update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/lld/trunk llvm/tools/lld
+    # Currently we do not want to fetch nor build libunwind, libcxx, libcxxabi, and lld on powerpc64 buildbots
+    if [ "$BUILDBOT_BUILDERNAME" != "sanitizer-ppc64-linux1" -a "$BUILDBOT_BUILDERNAME" != "sanitizer-ppc64le-linux" ]; then
+      update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libcxx/trunk llvm/projects/libcxx
+      update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libcxxabi/trunk llvm/projects/libcxxabi
+      update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/libunwind/trunk llvm/projects/libunwind
+      update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/lld/trunk llvm/tools/lld
+    fi
 }
 
 function set_chrome_suid_sandbox {
@@ -164,16 +176,30 @@
   local cmake_bug_workaround_cflags="$sanitizer_ldflags $fsanitize_flag -w"
   local sanitizer_cflags="-I${ROOT}/${libcxx_build_dir}/include -I${ROOT}/${libcxx_build_dir}/include/c++/v1 $cmake_bug_workaround_cflags"
   mkdir -p ${build_dir}
-  (cd ${build_dir} && \
-   cmake ${cmake_stage2_common_options} \
-     -DCMAKE_BUILD_TYPE=${build_type} \
-     -DLLVM_USE_SANITIZER=${llvm_use_sanitizer} \
-     -DLLVM_ENABLE_LIBCXX=ON \
-     -DCMAKE_C_FLAGS="${sanitizer_cflags}" \
-     -DCMAKE_CXX_FLAGS="${sanitizer_cflags}" \
-     -DCMAKE_EXE_LINKER_FLAGS="${sanitizer_ldflags}" \
-     $LLVM && \
-   ninja clang lld) || echo $step_result
+  # Currently we do not want to fetch nor build libunwind, libcxx, libcxxabi, and lld on powerpc64 buildbots
+  if [ "$BUILDBOT_BUILDERNAME" != "sanitizer-ppc64-linux1" -a "$BUILDBOT_BUILDERNAME" != "sanitizer-ppc64le-linux" ]; then
+    (cd ${build_dir} && \
+     cmake ${cmake_stage2_common_options} \
+       -DCMAKE_BUILD_TYPE=${build_type} \
+       -DLLVM_USE_SANITIZER=${llvm_use_sanitizer} \
+       -DLLVM_ENABLE_LIBCXX=ON \
+       -DCMAKE_C_FLAGS="${sanitizer_cflags}" \
+       -DCMAKE_CXX_FLAGS="${sanitizer_cflags}" \
+       -DCMAKE_EXE_LINKER_FLAGS="${sanitizer_ldflags}" \
+       $LLVM && \
+     ninja clang lld) || echo $step_result
+  else
+    (cd ${build_dir} && \
+     cmake ${cmake_stage2_common_options} \
+       -DCMAKE_BUILD_TYPE=${build_type} \
+       -DLLVM_USE_SANITIZER=${llvm_use_sanitizer} \
+       -DLLVM_ENABLE_LIBCXX=ON \
+       -DCMAKE_C_FLAGS="${sanitizer_cflags}" \
+       -DCMAKE_CXX_FLAGS="${sanitizer_cflags}" \
+       -DCMAKE_EXE_LINKER_FLAGS="${sanitizer_ldflags}" \
+       $LLVM && \
+     ninja clang) || echo $step_result
+  fi
 }
 
 function build_stage2_msan {
@@ -201,10 +227,13 @@
 
   (cd ${build_dir} && ninja check-clang) || echo $step_result
 
-  echo @@@BUILD_STEP check-lld ${sanitizer_name}@@@
+  # Currently we do not want to fetch nor build libunwind, libcxx, libcxxabi, and lld on powerpc64 buildbots
+  if [ "$BUILDBOT_BUILDERNAME" != "sanitizer-ppc64-linux1" -a "$BUILDBOT_BUILDERNAME" != "sanitizer-ppc64le-linux" ]; then
+    echo @@@BUILD_STEP check-lld ${sanitizer_name}@@@
 
-  # TODO(smatveev): change this to STEP_FAILURE once green
-  (cd ${build_dir} && ninja check-lld) || echo @@@STEP_WARNINGS@@@
+    # TODO(smatveev): change this to STEP_FAILURE once green
+    (cd ${build_dir} && ninja check-lld) || echo @@@STEP_WARNINGS@@@
+  fi
 }
 
 function check_stage2_msan {