[zorg] r214597 - Use gmake on FreeBSD lldb builder; temporarily relax the warnings level for lld builder on FreeBSD due the open bug 17788 - clang -pedantic -Werror complains about C11 Generics in math.h.

[Galina Kistanova]

Author: gkistanova
Date: Fri Aug  1 18:58:56 2014
New Revision: 214597

URL: http://llvm.org/viewvc/llvm-project?rev=214597&view=rev
Log:
Use gmake on FreeBSD lldb builder; temporarily relax the warnings level for lld builder on FreeBSD due the open bug 17788 - clang -pedantic -Werror complains about C11 Generics in math.h.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
    zorg/trunk/zorg/buildbot/builders/LLDBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=214597&r1=214596&r2=214597&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Aug  1 18:58:56 2014
@@ -554,6 +554,7 @@ def _get_lldb_builders():
          'slavenames': ["as-bldslv5"],
          'builddir': "lldb-x86_64-freebsd",
          'factory': LLDBBuilder.getLLDBBuildFactory(triple=None, # use default
+                                                    make='gmake',
                                                     extra_configure_args=['--enable-cxx11', '--enable-optimized', '--enable-assertions'])},
        ]
 
@@ -588,7 +589,9 @@ def _get_lld_builders():
          'slavenames' :["as-bldslv5"],
          'builddir':"lld-x86_64-freebsd",
          'factory': LLDBuilder.getLLDBuildFactory(jobs=32,
-                                                  extra_configure_args=['-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt'],
+                                                  extra_configure_args=[
+                                                      '-DCMAKE_EXE_LINKER_FLAGS=-lcxxrt',
+                                                      '-DLLVM_ENABLE_WERROR=OFF'],
                                                   env={'CXXFLAGS' : "-std=c++11 -stdlib=libc++"}),
          'category'   : 'lld'},
 

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=214597&r1=214596&r2=214597&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Fri Aug  1 18:58:56 2014
@@ -8,8 +8,16 @@ from buildbot.steps.shell import ShellCo
 from buildbot.process.properties import WithProperties
 from zorg.buildbot.commands.LitTestCommand import LitTestCommand
 
-def getLLDBBuildFactory(triple, outOfDir=False, useTwoStage=False, jobs='%(jobs)s',
-                        extra_configure_args=[], env={}, *args, **kwargs):
+def getLLDBBuildFactory(
+            triple,
+            outOfDir=False,
+            useTwoStage=False,
+            make='make',
+            jobs='%(jobs)s',
+            extra_configure_args=[],
+            env={},
+            *args,
+            **kwargs):
 
     inDir = not outOfDir and not useTwoStage
     if inDir:
@@ -82,8 +90,7 @@ def getLLDBBuildFactory(triple, outOfDir
 
     f.addStep(WarningCountingShellCommand(name="compile",
                                           command=['nice', '-n', '10',
-                                          'make', WithProperties("-j%s" % jobs)
-                                          ],
+                                                   make, WithProperties("-j%s" % jobs)],
                                           env=env,
                                           haltOnFailure=True,
                                           workdir=llvm_objdir))
@@ -91,7 +98,7 @@ def getLLDBBuildFactory(triple, outOfDir
     # Test.
     f.addStep(LitTestCommand(name="test lldb",
                              command=['nice', '-n', '10',
-                                      'make'],
+                                      make],
                              description="test lldb",
                              env=env,
                              workdir='%s/tools/lldb/test' % llvm_objdir))

Modified: zorg/trunk/zorg/buildbot/builders/LLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBuilder.py?rev=214597&r1=214596&r2=214597&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBuilder.py Fri Aug  1 18:58:56 2014
@@ -58,10 +58,14 @@ def getLLDBuildFactory(
                                haltOnFailure=False,
                                description=["create build dir"],
                                workdir="."))
-    cmakeCommand = [
-        "cmake",
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DLLVM_ENABLE_WERROR=ON"] + extra_configure_args + ["../%s" % llvm_srcdir]
+
+    cmakeCommand = ["cmake"]
+    # Reconsile configure args with the defaults we want.
+    if not any(a.startswith('-DCMAKE_BUILD_TYPE=')   for a in extra_configure_args):
+        cmakeCommand.append('-DCMAKE_BUILD_TYPE=Release')
+    if not any(a.startswith('-DLLVM_ENABLE_WERROR=') for a in extra_configure_args):
+        cmakeCommand.append('-DLLVM_ENABLE_WERROR=ON')
+    cmakeCommand += extra_configure_args + ["../%s" % llvm_srcdir]
 
     # Note: ShellCommand does not pass the params with special symbols right.
     # The " ".join is a workaround for this bug.