Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -148,96 +148,6 @@
 
     return f
 
-def getLLDBBuildFactory(
-            triple,
-            useTwoStage=False,
-            make='make',
-            jobs='%(jobs)s',
-            extra_configure_args=[],
-            env={},
-            *args,
-            **kwargs):
-
-    llvm_srcdir = "llvm.src"
-    llvm_objdir = "llvm.obj"
-
-    f = buildbot.process.factory.BuildFactory()
-
-    # Determine the build directory.
-    f.addStep(SetProperty(name="get_builddir",
-              command=["pwd"],
-              property="builddir",
-              description="set build dir",
-              workdir="."))
-
-    # Find out what version of llvm and clang are needed to build this version
-    # of lldb. Right now we will assume they use the same version.
-    # XXX - could this be done directly on the master instead of the slave?
-    f.addStep(SetProperty(command='svn cat http://llvm.org/svn/llvm-project/lldb/trunk/scripts/build-llvm.pl | grep ^our.*llvm_revision | cut -d \\" -f 2',
-                          property='llvmrev'))
-
-    # The SVN build step provides no mechanism to check out a specific revision
-    # based on a property, so just run the commands directly here.
-
-    svn_co = ['svn', 'checkout', '--force']
-    svn_co += ['--revision', WithProperties('%(llvmrev)s')]
-
-    # build llvm svn checkout command
-    svn_co_llvm = svn_co + \
-     [WithProperties('http://llvm.org/svn/llvm-project/llvm/trunk@%(llvmrev)s'),
-                     llvm_srcdir]
-    # build clang svn checkout command
-    svn_co_clang = svn_co + \
-     [WithProperties('http://llvm.org/svn/llvm-project/cfe/trunk@%(llvmrev)s'),
-                     '%s/tools/clang' % llvm_srcdir]
-
-    f.addStep(ShellCommand(name='svn-llvm',
-                           command=svn_co_llvm,
-                           haltOnFailure=True,
-                           workdir='.'))
-    f.addStep(ShellCommand(name='svn-clang',
-                           command=svn_co_clang,
-                           haltOnFailure=True,
-                           workdir='.'))
-
-    f.addStep(SVN(name='svn-lldb',
-                  mode='update',
-                  baseURL='http://llvm.org/svn/llvm-project/lldb/',
-                  defaultBranch='trunk',
-                  always_purge=True,
-                  workdir='%s/tools/lldb' % llvm_srcdir))
-
-    # Run configure
-    config_args = [WithProperties("%%(builddir)s/%s/configure" % llvm_srcdir),
-                   "--disable-bindings",
-                   "--without-llvmgcc",
-                   "--without-llvmgxx",
-                  ]
-    if triple:
-        config_args += ['--build=%s' % triple]
-    config_args += extra_configure_args
-
-    f.addStep(Configure(name='configure',
-        command=config_args,
-        env=env,
-        workdir=llvm_objdir))
-
-    f.addStep(WarningCountingShellCommand(name="compile",
-                                          command=['nice', '-n', '10',
-                                                   make, WithProperties("-j%s" % jobs)],
-                                          env=env,
-                                          haltOnFailure=True,
-                                          workdir=llvm_objdir))
-
-    # Test.
-    f.addStep(LitTestCommand(name="test lldb",
-                             command=['nice', '-n', '10',
-                                      make],
-                             description="test lldb",
-                             env=env,
-                             workdir='%s/tools/lldb/test' % llvm_objdir))
-
-    return f
 # Add test steps from list of compilers and archs
 def getLLDBTestSteps(f,
                      bindir,