[zorg] r274170 - Revert r274008 "[modules] We don't need to prebuild intrinsics_gen. The fake dependency is gone."

[Vassil Vassilev via llvm-commits]

Author: vvassilev
Date: Wed Jun 29 16:18:07 2016
New Revision: 274170

URL: http://llvm.org/viewvc/llvm-project?rev=274170&view=rev
Log:
Revert r274008 "[modules] We don't need to prebuild intrinsics_gen. The fake dependency is gone."

Some clang modules still cause implicit dependencies on intrinsics_gen.

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=274170&r1=274169&r2=274170&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Wed Jun 29 16:18:07 2016
@@ -433,6 +433,7 @@ def _get_clang_builders():
          'builddir' : "clang-x86_64-linux-selfhost-modules",
          'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-pc-linux-gnu',
                                                        useTwoStage=True,
+                                                       modules=True,
                                                        clean=False,
                                                        stage1_config='Release',
                                                        stage2_config='Release',
@@ -448,6 +449,7 @@ def _get_clang_builders():
          'builddir' : "clang-x86_64-linux-selfhost-modules-2",
          'factory' : ClangBuilder.getClangBuildFactory(triple='x86_64-pc-linux-gnu',
                                                        useTwoStage=True,
+                                                       modules=True,
                                                        clean=False,
                                                        stage1_config='Release',
                                                        stage2_config='Release',

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=274170&r1=274169&r2=274170&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Wed Jun 29 16:18:07 2016
@@ -42,7 +42,11 @@ def getClangBuildFactory(
             checkout_compiler_rt=False,
             run_gdb=False,
             run_modern_gdb=False,
-            run_gcc=False):
+            run_gcc=False,
+            modules=False):
+    assert not modules or useTwoStage, \
+           "modules build requires 2 stage cmake build for now"
+
     # Prepare environmental variables. Set here all env we want everywhere.
     merged_env = {
         'TERM' : 'dumb' # Make sure Clang doesn't use color escape sequences.
@@ -285,6 +289,18 @@ def getClangBuildFactory(
                            workdir=llvm_2_objdir,
                            env=merged_env))
 
+    if modules:
+        f.addStep(WarningCountingShellCommand(name="compile.llvm.stage2.intrinsics_gen",
+                                              command=['nice', '-n', '10',
+                                                       make, "intrinsics_gen", WithProperties("-j%s" % jobs)],
+                                              haltOnFailure=True,
+                                              description=["compiling", "(stage 2 intrinsics.gen)",
+                                                           stage2_config],
+                                              descriptionDone=["compile", "(stage 2 intrinsics.gen)",
+                                                               stage2_config],
+                                              workdir=llvm_2_objdir,
+                                              env=merged_env))
+
     # Build llvm (stage 2).
     f.addStep(WarningCountingShellCommand(name="compile.llvm.stage2",
                                           command=['nice', '-n', '10',