[zorg] r220210 - Add CMake extra opts for Libcxx builder

[Renato Golin]

Author: rengolin
Date: Mon Oct 20 11:52:23 2014
New Revision: 220210

URL: http://llvm.org/viewvc/llvm-project?rev=220210&view=rev
Log:
Add CMake extra opts for Libcxx builder

Modified:
    zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py?rev=220210&r1=220209&r2=220210&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LibcxxAndAbiBuilder.py Mon Oct 20 11:52:23 2014
@@ -42,7 +42,7 @@ def getLibcxxWholeTree(f, src_root):
     return f
 
 
-def getLibcxxAndAbiBuilder(f=None, env={}, additional_features=set()):
+def getLibcxxAndAbiBuilder(f=None, env={}, additional_features=set(), cmake_extra_opts={}):
     if f is None:
         f = buildbot.process.factory.BuildFactory()
 
@@ -76,6 +76,10 @@ def getLibcxxAndAbiBuilder(f=None, env={
         litTestArgs += (' --param=additional_features=' +
                        ','.join(additional_features))
 
+    cmake_opts = ['-DLLVM_LIT_ARGS='+litTestArgs]
+    for key in cmake_extra_opts:
+        cmake_opts.append('-D' + key + '=' + cmake_extra_opts[key])
+
     # Nuke/remake build directory and run CMake
     f.addStep(buildbot.steps.shell.ShellCommand(
         name='rm.builddir', command=['rm', '-rf', build_path],
@@ -85,8 +89,7 @@ def getLibcxxAndAbiBuilder(f=None, env={
         haltOnFailure=True, workdir=src_root))
 
     f.addStep(buildbot.steps.shell.ShellCommand(
-        name='cmake', command=['cmake', src_root,
-                               '-DLLVM_LIT_ARGS='+litTestArgs],
+        name='cmake', command=['cmake', src_root] + cmake_opts,
         haltOnFailure=True, workdir=build_path, env=env))
 
     # Build libcxxabi