[zorg] r182319 - Remove llvm-gcc as a possible builder type for the phased buildmaster.

[David Dean]

Author: ddean
Date: Mon May 20 16:48:44 2013
New Revision: 182319

URL: http://llvm.org/viewvc/llvm-project?rev=182319&view=rev
Log:
Remove llvm-gcc as a possible builder type for the phased buildmaster.

Modified:
    zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py

Modified: zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py?rev=182319&r1=182318&r2=182319&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py Mon May 20 16:48:44 2013
@@ -4,6 +4,7 @@ import zorg.buildbot.builders.ClangBuild
 from zorg.buildbot.builders.LLDBBuilder import getLLDBxcodebuildFactory
 import zorg.buildbot.builders.LibCXXBuilder as LibCXXBuilder
 
+
 """
 Helper module to handle automatically constructing builder objects from a
 builder name.
@@ -26,7 +27,7 @@ def construct(name):
     # First, determine the 'kind' of build we are doing. Compiler builds are a
     # common case, so we specialize their names -- other builds should have
     # their type delimited by '_'.
-    if name.startswith('clang-') or name.startswith('llvm-gcc-'):
+    if name.startswith('clang-'):
         kind,subname = 'compile',name
         if 'lto' in name:
             kind += '-lto'
@@ -127,7 +128,7 @@ def construct_compiler_builder_from_name
         config_options.extend(['--enable-optimized'])
         config_options.extend(['--disable-assertions'])
     else:
-        raise ValueError, "invalid build style: %r" % build_style    
+        raise ValueError, "invalid build style: %r" % build_style
 
     # Passing is_bootstrap==False will specify the stage 1 compiler as the
     # latest validated apple-clang style compiler.
@@ -243,7 +244,6 @@ def construct_libcxx_builder_from_name(n
     return { 'factory' : LibCXXBuilder.getLibCXXBuilder(),
              'properties' : {'use_builder' : cc_under_test } }
 
-
 builder_kinds = {
                   'compile' : construct_compiler_builder_from_name,
                   'compile-lto' : construct_lto_compiler_builder_from_name,