[zorg] r201498 - Try to fix the CentOS builder by disabling LLD build (which fails because of a

[Dmitri Gribenko]

Author: gribozavr
Date: Sun Feb 16 16:14:50 2014
New Revision: 201498

URL: http://llvm.org/viewvc/llvm-project?rev=201498&view=rev
Log:
Try to fix the CentOS builder by disabling LLD build (which fails because of a
bug in C++11 implementation in libstdc++ 4.7.2)

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.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=201498&r1=201497&r2=201498&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Sun Feb 16 16:14:50 2014
@@ -227,6 +227,7 @@ def _get_clang_fast_builders():
                     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'},
+                    withLLD=False,
                     extraCompilerOptions=['--gcc-toolchain=/opt/centos/devtoolset-1.1/root/usr'])},
         ]
 

Modified: zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py?rev=201498&r1=201497&r2=201498&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangAndLLDBuilder.py Sun Feb 16 16:14:50 2014
@@ -12,6 +12,7 @@ from zorg.buildbot.commands.NinjaCommand
 def getClangAndLLDBuildFactory(
            clean=True,
            env=None,
+           withLLD=True,
            extraCompilerOptions=None,
            buildWithSanitizerOptions=None):
 
@@ -60,11 +61,12 @@ def getClangAndLLDBuildFactory(
                   baseURL='http://llvm.org/svn/llvm-project/clang-tools-extra/',
                   defaultBranch='trunk',
                   workdir='%s/tools/clang/tools/extra' % llvm_srcdir))
-    f.addStep(SVN(name='svn-lld',
-                  mode='update',
-                  baseURL='http://llvm.org/svn/llvm-project/lld/',
-                  defaultBranch='trunk',
-                  workdir='%s/tools/lld' % llvm_srcdir))
+    if withLLD:
+        f.addStep(SVN(name='svn-lld',
+                      mode='update',
+                      baseURL='http://llvm.org/svn/llvm-project/lld/',
+                      defaultBranch='trunk',
+                      workdir='%s/tools/lld' % llvm_srcdir))
 
     # Clean directory, if requested.
     if clean: