[zorg] r200334 - Added new builder llvm-clang-lld-x86_64-centos-6.5 on CentOS 6.5 x86-64 (VM) slave.

[Galina Kistanova]

Author: gkistanova
Date: Tue Jan 28 13:48:42 2014
New Revision: 200334

URL: http://llvm.org/viewvc/llvm-project?rev=200334&view=rev
Log:
Added new builder llvm-clang-lld-x86_64-centos-6.5 on  CentOS 6.5 x86-64 (VM) slave.
Patch by Dmitri Gribenko!

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/buildbot/osuosl/master/config/slaves.py
    zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.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=200334&r1=200333&r2=200334&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Tue Jan 28 13:48:42 2014
@@ -219,6 +219,14 @@ def _get_clang_fast_builders():
                     env={'PATH':'/home/llvmbb/bin/clang-latest/bin:/home/llvmbb/bin:/usr/local/bin:/usr/local/bin:/usr/bin:/bin',
                          'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes'})},
 
+        {'name': "llvm-clang-lld-x86_64-centos-6.5",
+         'slavenames':["gribozavr3"],
+         'builddir':"llvm-clang-lld-x86_64-centos-6.5",
+         'factory': ClangAndLLDBuilder.getClangAndLLDBuildFactory(
+                    env={'PATH': '/opt/centos/devtoolset-1.1/root/usr/bin:/home/llvmbb/bin:/bin:/usr/bin',
+                         'LD_LIBRARY_PATH': '/opt/centos/devtoolset-1.1/root/usr/lib64',
+                         'CC': 'ccache clang', 'CXX': 'ccache clang++', 'CCACHE_CPP2': 'yes'},
+                    extraCompilerOptions=['--gcc-toolchain=/opt/centos/devtoolset-1.1/root/usr'])},
         ]
 
 # Clang builders.

Modified: zorg/trunk/buildbot/osuosl/master/config/slaves.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/slaves.py?rev=200334&r1=200333&r2=200334&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py Tue Jan 28 13:48:42 2014
@@ -224,6 +224,9 @@ def get_build_slaves():
         # Ubuntu 13.04 x86-64, Intel(R) Xeon(R) CPU 5160 @ 3.00GHz
         create_slave("gribozavr2", properties={'jobs': 4}, max_builds=1),
 
+        # CentOS 6.5 x86-64, VM on Intel(R) Core(TM) i5 CPU 750 @ 2.67GHz
+        create_slave("gribozavr3", properties={'jobs': 4}, max_builds=1),
+
         # Debian Testing x86-64, Intel Core i5-3570K (ivybridge) CPU @ 3.40GHz
         create_slave("obbligato-ellington", properties={'jobs': 2}, max_builds=1),
 

Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=200334&r1=200333&r2=200334&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Tue Jan 28 13:48:42 2014
@@ -12,6 +12,7 @@ from zorg.buildbot.commands.NinjaCommand
 def getClangAndLLDBuildFactory(
            clean=True,
            env=None,
+           extraCompilerOptions=None,
            buildWithSanitizerOptions=None):
 
     llvm_srcdir = "llvm.src"
@@ -82,7 +83,10 @@ def getClangAndLLDBuildFactory(
                                workdir=".",
                                env=merged_env))
 
-    options = ["-std=c++11", "-Wdocumentation", "-Wno-documentation-deprecated-sync"]
+    options = ["-Wdocumentation", "-Wno-documentation-deprecated-sync"]
+
+    if extraCompilerOptions:
+        options += extraCompilerOptions
 
     if buildWithSanitizerOptions:
         options += buildWithSanitizerOptions
@@ -108,7 +112,8 @@ def getClangAndLLDBuildFactory(
             "-DCMAKE_C_COMPILER=clang",
             "-DCMAKE_CXX_COMPILER=clang++"]
     cmakeCommand += [
-        "-DCMAKE_CXX_FLAGS=\"%s\"" % (" ".join(options)),
+        "-DCMAKE_C_FLAGS=\"%s\"" % (" ".join(options)),
+        "-DCMAKE_CXX_FLAGS=\"-std=c++11 %s\"" % (" ".join(options)),
         "-DLLVM_LIT_ARGS=\"-v\"",
         "-G", "Ninja",
         "../%s" % llvm_srcdir]