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

Richard Smith richard at metafoo.co.uk
Thu Sep 25 11:38:13 PDT 2014


================
Comment at: zorg/buildbot/builders/ClangBuilder.py:46
@@ +45,3 @@
+            cmake=None,
+            modules=False):
+    assert not modules or (cmake and useTwoStage), \
----------------
dblaikie wrote:
> 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?
Yes, it should =) Done, but I've not tested the cmake build /without/ modules.

================
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"],
----------------
dblaikie wrote:
> Trivial & can be committed separately if you like, of course.
Committed separately.

================
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,
----------------
dblaikie wrote:
> 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)
I've changed this so we only unconditionally clean stage2 for a cmake build. I don't want to change the behavior of existing buildbots, even though it doesn't seem very sensible to do an incremental build of stage2.

http://reviews.llvm.org/D4936






More information about the llvm-commits mailing list