[PATCH] [zorg] Add libc++ and libc++abi builders for Linux.

Dmitri Gribenko gribozavr at gmail.com
Mon Aug 4 23:23:21 PDT 2014


================
Comment at: buildbot/osuosl/master/master.cfg:166-170
@@ +165,7 @@
+                            builderNames=get_all_for("libcxx"),
+                            change_filter=depends_on([
+                                "llvm",
+                                "cfe",
+                                "libcxx",
+                                "libcxxabi"])))
+
----------------
I don't think it depends on llvm and cfe, unless we are rebuilding a trunk clang every time.


================
Comment at: zorg/buildbot/builders/LibcxxAndAbiBuilder.py:43
@@ +42,3 @@
+
+def getLibcxxAndAbiBuilder(f=None, clang='clang', clangxx='clang++'):
+    if f is None:
----------------
Please add an env var dictionary parameter like in other builder factories.

Then 'clang' and 'clangxx' parameters are not needed.  When adding a builder one would just add CC='clang-3.5' or CC='clang-3.6'.

================
Comment at: zorg/buildbot/builders/LibcxxAndAbiBuilder.py:50-52
@@ +49,5 @@
+
+    src_root = 'llvm'
+    build_path = os.path.join(src_root, 'build')
+    f = getLibcxxWholeTree(f, src_root)
+
----------------
I am not sure if a non-fully qualified path will work.  All other builder factories have a 'get_builddir' step.

Also, can we move 'build' one level up?

Do we need to `rm -rf` the previous build?

================
Comment at: zorg/buildbot/builders/LibcxxAndAbiBuilder.py:62
@@ +61,3 @@
+        name='cmake', command=['cmake', '..'], haltOnFailure=True,
+        workdir=build_path, env={'CC': clang, 'CXX': clangxx}))
+
----------------
Dan Albert wrote:
> gribozavr: can I assume there's a relatively recent clang installed on your buildslave?
Of course, there is Clang 3.5 installed.

http://reviews.llvm.org/D4786






More information about the cfe-commits mailing list