[PATCH] Teach zorg to support cmake and modules for Clang builders

David Blaikie dblaikie at gmail.com
Mon Sep 15 17:10:48 PDT 2014


================
Comment at: zorg/buildbot/builders/ClangBuilder.py:46
@@ +45,3 @@
+            cmake=None,
+            modules=False):
+    assert not modules or (cmake and useTwoStage), \
----------------
This flag seems unused apart from the assertion below. Should it instead conditionalize the use of modules down around line 355 as well as being used in this assertion?

================
Comment at: zorg/buildbot/builders/ClangBuilder.py:251
@@ -223,3 +250,3 @@
                                               haltOnFailure=True,
-                                              description=["compilinge", stage1_config, "examples"],
+                                              description=["compiling", stage1_config, "examples"],
                                               descriptionDone=["compile", stage1_config, "examples"],
----------------
Trivial & can be committed separately if you like, of course.

================
Comment at: zorg/buildbot/builders/ClangBuilder.py:331
@@ +330,3 @@
+    f.addStep(ShellCommand(name="rm-llvm.obj.stage2",
+                           command=["rm", "-rf", llvm_2_objdir],
+                           haltOnFailure=True,
----------------
Making this unconditional is an independent bug fix, I assume? (stage2 wouldn't benefit from any caching, so it should always be a clean build)

http://reviews.llvm.org/D4936






More information about the llvm-commits mailing list