diff --git a/zorg/buildbot/builders/annotated/ve-linux-steps.make b/zorg/buildbot/builders/annotated/ve-linux-steps.make
--- a/zorg/buildbot/builders/annotated/ve-linux-steps.make
+++ b/zorg/buildbot/builders/annotated/ve-linux-steps.make
@@ -120,7 +120,7 @@
 	    -DCMAKE_AR=${INTREE_PREFIX}/bin/llvm-ar \
 	    -DCMAKE_RANLIB=${INTREE_PREFIX}/bin/llvm-ranlib \
 	    -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-	    -DLLVM_CONFIG_PATH=${INTREE_PREFIX}/bin/llvm-config \
+	    -DLLVM_CMAKE_DIR=${INTREE_PREFIX} \
 	    -DCMAKE_BUILD_TYPE="${CRT_BUILD_TYPE}" \
 	    -DCMAKE_INSTALL_PREFIX="${CLANG_RESDIR}" \
 	    -DCMAKE_CXX_FLAGS="-nostdlib" \
@@ -212,7 +212,6 @@
 	      -DCMAKE_RANLIB=${INTREE_PREFIX}/bin/llvm-ranlib \
 	      -DCMAKE_C_COMPILER_TARGET="${VE_TARGET}" \
 	      -DCMAKE_CXX_COMPILER_TARGET="${VE_TARGET}" \
-	      -DLLVM_CONFIG_PATH=${INTREE_PREFIX}/bin/llvm-config \
 	      -DCMAKE_BUILD_TYPE="${LIBCXXABI_BUILD_TYPE}" \
 	      -DCMAKE_INSTALL_PREFIX="${CLANG_RESDIR}" \
 	      -DLIBCXXABI_LIBDIR_SUFFIX="${LINUX_VE_LIBSUFFIX}" \
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
--- a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
@@ -90,7 +90,7 @@
     ${CMAKE_COMMON_OPTIONS} \
     -DCMAKE_C_COMPILER=$CLANG_PATH \
     -DCMAKE_CXX_COMPILER=$CLANGXX_PATH \
-    -DLLVM_CONFIG_PATH=$ROOT/llvm_build64/bin/llvm-config \
+    -DLLVM_CMAKE_DIR=$ROOT/llvm_build64 \
     -DCOMPILER_RT_BUILD_BUILTINS=OFF \
     -DCOMPILER_RT_INCLUDE_TESTS=ON \
     -DCOMPILER_RT_ENABLE_WERROR=ON \
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
@@ -247,7 +247,7 @@
   -DCMAKE_CXX_COMPILER=${FRESH_CLANG_PATH}/clang++ \
   -DCOMPILER_RT_INCLUDE_TESTS=ON \
   -DCOMPILER_RT_ENABLE_WERROR=ON \
-  -DLLVM_CONFIG_PATH=${FRESH_CLANG_PATH}/llvm-config \
+  -DLLVM_CMAKE_DIR=${ROOT}/llvm_build64 \
   $COMPILER_RT) || build_failure
 (cd compiler_rt_build && make -j$MAKE_JOBS) || build_failure
 
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh b/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh
--- a/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_qemu.sh
@@ -216,7 +216,7 @@
       cmake \
         ${CMAKE_COMMON_OPTIONS} \
         -DCOMPILER_RT_DEBUG=$DBG \
-        -DLLVM_CONFIG_PATH=${COMPILER_BIN_DIR}/llvm-config \
+        -DLLVM_CMAKE_DIR="${STAGE2_DIR}" \
         -DCMAKE_C_COMPILER=${COMPILER_BIN_DIR}/clang \
         -DCMAKE_CXX_COMPILER=${COMPILER_BIN_DIR}/clang++ \
         -DCOMPILER_RT_HAS_LLD=ON \