[llvm-commits] [zorg] r152724 - /zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

[Duncan Sands]

Author: baldrick
Date: Wed Mar 14 11:07:07 2012
New Revision: 152724

URL: http://llvm.org/viewvc/llvm-project?rev=152724&view=rev
Log:
LLDB doesn't need to patch LLVM/clang anymore it seems.

Modified:
    zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=152724&r1=152723&r2=152724&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Wed Mar 14 11:07:07 2012
@@ -28,12 +28,6 @@
                                                description="set build dir",
                                                workdir="."))
 
-    # We really want to revert the patched llvm/clang files but svn sometimes
-    # doesn't do the right thing. We're left with removing and rebuilding.
-    f.addStep(ShellCommand(name='rm-%s' % llvm_srcdir,
-                           command=['rm', '-rf', llvm_srcdir],
-                           haltOnFailure = True,
-                           workdir='.', env=env))
     # 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?
@@ -71,16 +65,6 @@
                   always_purge=True,
                   workdir='%s/tools/lldb' % llvm_srcdir))
 
-    # Patch llvm with lldb changes
-    f.addStep(ShellCommand(name='patch.llvm',
-        command='for i in tools/lldb/scripts/llvm*.diff; do echo "Patching with file $i"; patch -p0 -i $i; done',
-        workdir=llvm_srcdir))
-
-    # Patch clang with lldb changes
-    f.addStep(ShellCommand(name='patch.clang',
-        command='for i in ../lldb/scripts/clang*.diff; do echo "Patching with file $i"; patch -p0 -i $i; done',
-        workdir='%s/tools/clang' % llvm_srcdir))
-
     # Run configure
     config_args = [WithProperties("%%(builddir)s/%s/configure" % llvm_srcdir),
                    "--disable-bindings",