[Lldb-commits] [PATCH] D69341: [zorg] Port LLDB cmake build factory to git

Pavel Labath via Phabricator via lldb-commits lldb-commits at lists.llvm.org
Wed Oct 23 22:32:59 PDT 2019


labath updated this revision to Diff 226200.
labath added a comment.

add '/llvm' ...


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D69341/new/

https://reviews.llvm.org/D69341

Files:
  zorg/buildbot/builders/LLDBBuilder.py


Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -66,7 +66,9 @@
             install=False):
 
     ############# PREPARING
-    f = buildbot.process.factory.BuildFactory()
+    f = LLVMBuildFactory(
+            is_legacy_mode=False,
+            depends_on_projects=["llvm", "clang", "lldb", "lld"])
 
     # Determine Slave Environment and Set MSVC environment.
     if vs:
@@ -74,7 +76,7 @@
             command=getVisualStudioEnvironment(vs, target_arch),
             extract_fn=extractSlaveEnvironment))
 
-    f = getLLDBSource(f,'llvm')
+    f.addGetSourcecodeSteps()
 
     build_cmd=['ninja']
     install_cmd = ['ninja','install']
@@ -105,7 +107,7 @@
                 ))
 
     cmake_cmd = [
-        "cmake", "-G", "Ninja", "../llvm",
+        "cmake", "-G", "Ninja", os.path.join(os.pardir, f.monorepo_dir, "llvm"),
         "-DCMAKE_BUILD_TYPE=" + config,
         "-DCMAKE_INSTALL_PREFIX=../install"
         ]


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69341.226200.patch
Type: text/x-patch
Size: 1078 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20191024/510bcd79/attachment.bin>


More information about the lldb-commits mailing list