[zorg] r190231 - Forgot to implement the necessary code for construct_compiler_builder_from_name.

[Michael Gottesman]

Author: mgottesman
Date: Fri Sep  6 19:05:55 2013
New Revision: 190231

URL: http://llvm.org/viewvc/llvm-project?rev=190231&view=rev
Log:
Forgot to implement the necessary code for construct_compiler_builder_from_name.

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=190231&r1=190230&r2=190231&view=diff
==============================================================================
--- zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py (original)
+++ zorg/trunk/buildbot/llvmlab/master/config/builderconstruction.py Fri Sep  6 19:05:55 2013
@@ -69,7 +69,8 @@ def construct(name):
     return builder
 
 def construct_compiler_builder_from_name(name, use_lto=False,
-                                         incremental=False):
+                                         incremental=False,
+                                         use_cxx11=False):
     
     # Compiler builds are named following:
     #   <compiler>-<host arch>-<host os>-[<build cc>-]<build style>.
@@ -117,15 +118,15 @@ def construct_compiler_builder_from_name
     config_options = ['--build=%s' % target_triple,
                       '--host=%s' % target_triple]
 
-    if build_style in ['DA', 'DAlto', 'DAincremental']:
+    if build_style in ['DA', 'DAlto', 'DAincremental', 'DAincrementalcxx11']:
         build_config = "Debug+Asserts"
         config_options.extend(['--disable-optimized'])
         config_options.extend(['--enable-assertions'])
-    elif build_style in ['RA', 'RAlto', 'RAincremental']:
+    elif build_style in ['RA', 'RAlto', 'RAincremental', 'RAincrementalcxx11']:
         build_config = "Release+Asserts"
         config_options.extend(['--enable-optimized'])
         config_options.extend(['--enable-assertions'])
-    elif build_style in ['R', 'Rlto', 'Rincremental']:
+    elif build_style in ['R', 'Rlto', 'Rincremental', 'Rincrementalcxx11']:
         build_config = "Release"
         config_options.extend(['--enable-optimized'])
         config_options.extend(['--disable-assertions'])
@@ -140,7 +141,8 @@ def construct_compiler_builder_from_name
         return { 'factory' : ClangBuilder.phasedClang(config_options,
                                          is_bootstrap=(build_cc is None),
                                          use_lto=use_lto,
-                                         incremental=incremental) }
+                                         incremental=incremental,
+                                         use_cxx11=use_cxx11) }
     elif compiler == 'llvm-gcc':
         # Currently, llvm-gcc builders do their own two-stage build,
         # they don't use any prebuilt artifacts.