Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
@@ -13,6 +13,8 @@
 LOCAL_IPS=`hostname -I`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=0
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
@@ -11,6 +11,8 @@
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=0
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
@@ -11,6 +11,8 @@
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=0
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
@@ -11,6 +11,8 @@
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=0
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
@@ -40,6 +40,8 @@
   CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_BINUTILS_INCDIR=/usr/include"
 fi
 
+USE_GIT=0
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_SYMBOLIZER=${CHECK_SYMBOLIZER:-$CHECK_LIBCXX}
 CHECK_LLD=${CHECK_LLD:-1}
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fast.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fast.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fast.sh
@@ -11,6 +11,8 @@
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=1
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
@@ -27,6 +29,7 @@
 if [ "$BUILDBOT_CLOBBER" != "" ]; then
   echo @@@BUILD_STEP clobber@@@
   rm -rf llvm
+  rm -rf llvm-project
   rm -rf ${STAGE1_DIR}
 fi
 
@@ -37,7 +40,7 @@
 CMAKE_COMMON_OPTIONS="$CMAKE_COMMON_OPTIONS -DLLVM_ENABLE_ASSERTIONS=ON"
 
 echo @@@BUILD_STEP update@@@
-buildbot_update
+buildbot_update_git
 
 # Stage 2 / Memory Sanitizer
 
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
@@ -47,6 +47,10 @@
 
 
 function buildbot_update {
+    if [[ "$USE_GIT" != "0" ]]; then
+      buildbot_update_git
+      return
+    fi
     if [[ -d "$BUILDBOT_MONO_REPO_PATH" ]]; then
       BUILDBOT_REVISION="-"
     else
@@ -173,7 +177,10 @@
 
 function build_stage1_clang {
   mkdir -p ${STAGE1_DIR}
-  cmake_stage1_options="${CMAKE_COMMON_OPTIONS}"
+  local cmake_stage1_options="${CMAKE_COMMON_OPTIONS}"
+  if [[ "$USE_GIT" != "0" ]]; then
+    cmake_stage1_options="${cmake_stage1_options} -DLLVM_ENABLE_PROJECTS='clang;compiler-rt;lld'"
+  fi
   (cd ${STAGE1_DIR} && cmake ${cmake_stage1_options} $LLVM && \
     ninja clang lld compiler-rt llvm-symbolizer)
 }
@@ -187,7 +194,7 @@
     echo @@@BUILD_STEP using pre-built stage1 clang at r$HOST_CLANG_REVISION@@@
   else
     echo @@@BUILD_STEP sync to r$HOST_CLANG_REVISION@@@
-    (BUILDBOT_REVISION=$HOST_CLANG_REVISION buildbot_update)
+    BUILDBOT_REVISION=$HOST_CLANG_REVISION buildbot_update
 
     echo @@@BUILD_STEP Clear ${STAGE1_DIR} ${STAGE1_CLOBBER}
     rm -rf ${STAGE1_DIR} ${STAGE1_CLOBBER}
@@ -250,9 +257,14 @@
        "$sanitizer_name" != "ubsan" ]; then
     echo @@@BUILD_STEP build libcxx/$sanitizer_name@@@
     mkdir -p ${libcxx_build_dir}
+    local cmake_stage2_libcxx_options=
+    if [[ "$USE_GIT" != "0" ]]; then
+      cmake_stage2_libcxx_options="-DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi'"
+    fi
     (cd ${libcxx_build_dir} && \
       cmake \
         ${cmake_stage2_common_options} \
+        ${cmake_stage2_libcxx_options} \
         -DCMAKE_BUILD_TYPE=${build_type} \
         -DLLVM_USE_SANITIZER=${llvm_use_sanitizer} \
         $LLVM && \
@@ -273,8 +285,18 @@
   if [ "$CHECK_LLD" != "0" ]; then
     extra_dir="lld"
   fi
+  local cmake_stage2_clang_options=
+  if [[ "$USE_GIT" != "0" ]]; then
+    local projects=clang
+    if [[ "$CHECK_LLD" != "0" ]]; then
+      projects="${projects};lld"
+    fi
+    cmake_stage2_clang_options="-DLLVM_ENABLE_PROJECTS='${projects}'"
+  fi
   (cd ${build_dir} && \
-   cmake ${cmake_stage2_common_options} \
+   cmake \
+     ${cmake_stage2_common_options} \
+     ${cmake_stage2_clang_options} \
      -DCMAKE_BUILD_TYPE=${build_type} \
      -DLLVM_USE_SANITIZER=${llvm_use_sanitizer} \
      ${cmake_libcxx_flag} \
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh
@@ -11,6 +11,8 @@
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=0
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-0}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_mte.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_mte.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_mte.sh
@@ -11,6 +11,8 @@
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=0
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_perf_asan.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_perf_asan.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_perf_asan.sh
@@ -11,6 +11,8 @@
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=0
+
 LLVM=$ROOT/llvm
 CLANG_BUILD=$ROOT/clang_build
 SPEC_DIRNAME=SPEC_CPU2006v1.2
Index: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh
===================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh
@@ -25,6 +25,9 @@
 ROOT=`pwd`
 PLATFORM=`uname`
 MAKE_JOBS=${MAX_MAKE_JOBS:-$(nproc)}
+
+USE_GIT=0
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}