Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -826,7 +826,8 @@
          'slavenames' :["windows-lld-thinlto-1"],
          'builddir': "clang-with-thin-lto-windows",
          'factory': AnnotatedBuilder.getAnnotatedBuildFactory(
-             script="clang-with-thin-lto-windows.py"),
+             script="clang-with-thin-lto-windows.py",
+             depends_on_projects=['llvm', 'clang', 'lld']),
          'category'   : 'lld'},
 
         {'name' : "clang-lld-x86_64-2stage",
Index: zorg/buildbot/builders/AnnotatedBuilder.py
===================================================================
--- zorg/buildbot/builders/AnnotatedBuilder.py
+++ zorg/buildbot/builders/AnnotatedBuilder.py
@@ -1,16 +1,17 @@
 import os
 
 import buildbot
-import buildbot.process.factory
 from buildbot.process.properties import WithProperties
 from buildbot.steps.shell import SetProperty, ShellCommand
 from buildbot.steps.source import SVN
 from zorg.buildbot.commands.AnnotatedCommand import AnnotatedCommand
+from zorg.buildbot.process.factory import LLVMBuildFactory
 
 
 def getAnnotatedBuildFactory(
     script,
     clean=False,
+    depends_on_projects=None,
     env=None,
     timeout=1200):
     """
@@ -19,7 +20,9 @@
     not require a buildmaster restart to update.
     """
 
-    f = buildbot.process.factory.BuildFactory()
+    f = LLVMBuildFactory(
+        depends_on_projects=depends_on_projects,
+        llvm_srcdir='llvm.src')
 
     if clean:
       f.addStep(SetProperty(property='clean', command='echo 1'))