[zorg] r270725 - Pass the stage2 configuration as a argument.

[Vassil Vassilev via llvm-commits]

Author: vvassilev
Date: Wed May 25 12:10:03 2016
New Revision: 270725

URL: http://llvm.org/viewvc/llvm-project?rev=270725&view=rev
Log:
Pass the stage2 configuration as a argument.

This helps in configuring more precisely our module builds.

Patch reviewed by Galina Kistanova.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.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=270725&r1=270724&r2=270725&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed May 25 12:10:03 2016
@@ -440,7 +440,9 @@ def _get_clang_builders():
                                                        extra_configure_args=['-DCMAKE_C_COMPILER=clang',
                                                                              '-DCMAKE_CXX_COMPILER=clang++',
                                                                              '-DCMAKE_CXX_FLAGS=-stdlib=libc++',
-                                                                             '-DLLVM_ENABLE_ASSERTIONS=ON'])},
+                                                                             '-DLLVM_ENABLE_ASSERTIONS=ON'],
+                                                       stage2_extra_configure_args=['-DCMAKE_CXX_FLAGS=-stdlib=libc++',
+                                                                                    '-DLLVM_ENABLE_MODULES=1'])},
 
         {'name' : "clang-x86_64-linux-selfhost-modules-2",
          'slavenames' : ["modules-slave-2"],
@@ -454,7 +456,9 @@ def _get_clang_builders():
                                                        extra_configure_args=['-DCMAKE_C_COMPILER=clang',
                                                                              '-DCMAKE_CXX_COMPILER=clang++',
                                                                              '-DCMAKE_CXX_FLAGS=-stdlib=libstdc++',
-                                                                             '-DLLVM_ENABLE_ASSERTIONS=ON'])},
+                                                                             '-DLLVM_ENABLE_ASSERTIONS=ON'],
+                                                       stage2_extra_configure_args=['-DCMAKE_CXX_FLAGS=-stdlib=libstdc++',
+                                                                                    '-DLLVM_ENABLE_MODULES=1'])},
 
         {'name' : "clang-x64-ninja-win7",
          'slavenames' : ["windows7-buildbot"],

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=270725&r1=270724&r2=270725&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed May 25 12:10:03 2016
@@ -34,6 +34,7 @@ def getClangBuildFactory(
             stage2_config='Release+Asserts',
             env={}, # Environmental variables for all steps.
             extra_configure_args=[],
+            stage2_extra_configure_args=[],
             use_pty_in_tests=False,
             trunk_revision=None,
             force_checkout=False,
@@ -277,20 +278,12 @@ def getClangBuildFactory(
                            env=merged_env))
 
     # Configure llvm (stage 2).
-    c_flags = ''
-    cxx_flags = ''
-    extra_args = []
-    if modules:
-        extra_args = ['-DLLVM_ENABLE_MODULES=1']
-
     f.addStep(ShellCommand(name='cmake',
-                           command=['cmake'] + extra_args + [
+                           command=['cmake'] + stage2_extra_configure_args + [
                                     '-DLLVM_BUILD_TESTS=ON',
                                     WithProperties('-DCMAKE_C_COMPILER=%%(builddir)s/%s/bin/clang' % llvm_1_objdir), # FIXME use installdir
                                     WithProperties('-DCMAKE_CXX_COMPILER=%%(builddir)s/%s/bin/clang++' % llvm_1_objdir),
                                     '-DCMAKE_BUILD_TYPE=%s' % stage2_config,
-                                    WithProperties('-DCMAKE_C_FLAGS=%s' % c_flags),
-                                    WithProperties('-DCMAKE_CXX_FLAGS=%s %s' % (c_flags, cxx_flags)),
                                     "../" + llvm_srcdir],
                            description='cmake stage2',
                            workdir=llvm_2_objdir,