Added few missing things to ClangLTOBuilder3Stage builder.
git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@261414 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/zorg/buildbot/builders/ClangLTOBuilder3Stage.py b/zorg/buildbot/builders/ClangLTOBuilder3Stage.py
index d8696ff..bea2eec 100644
--- a/zorg/buildbot/builders/ClangLTOBuilder3Stage.py
+++ b/zorg/buildbot/builders/ClangLTOBuilder3Stage.py
@@ -4,6 +4,7 @@
from buildbot.steps.shell import WarningCountingShellCommand
from buildbot.process.factory import BuildFactory
from buildbot.process.properties import WithProperties
+from zorg.buildbot.commands.NinjaCommand import NinjaCommand
def get3StageClangLTOBuildFactory(
clean=True,
@@ -59,13 +60,15 @@
# Clean directory, if requested.
cleanBuildRequested = lambda step: step.build.getProperty("clean") or clean
f.addStep(
- doStepIf=cleanBuildRequested,
- name="rm-llvm_objdir",
- command=["rm", "-rf", llvm_objdir],
- haltOnFailure=True,
- description=["rm build dir", "llvm"],
- workdir=".",
- env=merged_env
+ ShellCommand(
+ doStepIf=cleanBuildRequested,
+ name="rm-llvm_objdir",
+ command=["rm", "-rf", llvm_objdir],
+ haltOnFailure=True,
+ description=["rm build dir", "llvm"],
+ workdir=".",
+ env=merged_env
+ )
)
cmake_command = ["cmake"]