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

[Duncan Sands]

Author: baldrick
Date: Thu Oct 13 03:26:44 2011
New Revision: 141860

URL: http://llvm.org/viewvc/llvm-project?rev=141860&view=rev
Log:
Add a 32 bit LLVM builder.  This is running on a 64 bit machine so
take extra care to ensure that only 32 bit code is produced.

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=141860&r1=141859&r2=141860&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Thu Oct 13 03:26:44 2011
@@ -57,6 +57,11 @@
           'factory': LLVMBuilder.getLLVMBuildFactory("x86_64-pc-linux-gnu", valgrind=True,
                                                      valgrindLeakCheck=True,
                                                      valgrindSuppressions='utils/valgrind/x86_64-pc-linux-gnu.supp')},
+        {'name': "llvm-i686-debian",
+         'slavenames': ["gcc15"],
+         'builddir': "llvm-i686-debian", 
+         'factory': LLVMBuilder.getLLVMBuildFactory("i686-pc-linux-gnu",
+                                                    extra_configure_args=['CC="gcc -m32"', 'CXX="g++ -m32"'])},
         ]
 
 # Offline.

Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=141860&r1=141859&r2=141860&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Thu Oct 13 03:26:44 2011
@@ -16,7 +16,8 @@
                         valgrindLeakCheck=False, valgrindSuppressions=None,
                         jobs='%(jobs)s', timeout=20, make='make',
                         enable_shared=False, enable_targets=None, defaultBranch='trunk',
-                        llvmgccdir=None, config_name='Debug+Asserts'):
+                        llvmgccdir=None, config_name='Debug+Asserts',
+                        extra_configure_args=[]):
     f = buildbot.process.factory.BuildFactory()
 
     # Determine the build directory.
@@ -47,6 +48,7 @@
                            '--target=%s' % triple]
     if enable_shared:
         configure_args.append('--enable-shared')
+    configure_args.extend(extra_configure_args)
     f.addStep(Configure(command=configure_args,
                         workdir='llvm',
                         description=['configuring',config_name],