[llvm-commits] [zorg] r97732 - in /zorg/trunk: buildbot/osuosl/master/config/builders.py zorg/buildbot/builders/LLVMBuilder.py

[Jakob Stoklund Olesen]

Author: stoklund
Date: Thu Mar  4 11:45:23 2010
New Revision: 97732

URL: http://llvm.org/viewvc/llvm-project?rev=97732&view=rev
Log:
Add --enable-shared to configure on the llvm-i686-linux builder.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LLVMBuilder.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=97732&r1=97731&r2=97732&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Mar  4 11:45:23 2010
@@ -10,7 +10,7 @@
         {'name': "llvm-i686-linux",
          'slavenames': ["dunbar1"],
          'builddir': "llvm-i686", 
-         'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", 2)},
+         'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu", jobs=2, enable_shared=True)},
         {'name': "llvm-x86_64-linux",
          'slavenames': ["osu1"],
          'builddir': "llvm-x86_64",

Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=97732&r1=97731&r2=97732&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Thu Mar  4 11:45:23 2010
@@ -11,7 +11,8 @@
 
 def getLLVMBuildFactory(triple=None, clean=True, test=True,
                         expensive_checks=False, examples=False,
-                        jobs='%(jobs)s', timeout=20, make='make'):
+                        jobs='%(jobs)s', timeout=20, make='make',
+                        enable_shared=False):
     f = buildbot.process.factory.BuildFactory()
 
     # Determine the build directory.
@@ -37,6 +38,8 @@
         configure_args += ['--build=%s' % triple,
                            '--host=%s' % triple,
                            '--target=%s' % triple]
+    if enable_shared:
+        configure_args.append('--enable-shared')
     f.addStep(Configure(command=configure_args,
                         workdir='llvm',
                         description=['configuring',config_name],