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

[Duncan Sands]

Author: baldrick
Date: Mon Oct  4 10:38:45 2010
New Revision: 115507

URL: http://llvm.org/viewvc/llvm-project?rev=115507&view=rev
Log:
Make it possible to specify extra languages for llvm-gcc.  Give
this a whirl by having the i386 buildbot build Fortran as well
as C and C++.

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.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=115507&r1=115506&r2=115507&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Mon Oct  4 10:38:45 2010
@@ -94,6 +94,7 @@
          'slavenames':["gcc11"],
          'builddir':"llvm-gcc-i386-linux-selfhost",
          'factory':LLVMGCCBuilder.getLLVMGCCBuildFactory(triple='i686-pc-linux-gnu',
+                                                         extra_languages="fortran",
                                                          extra_configure_args=['--disable-multilib',
                                                          '--enable-targets=all','--with-as=/home/baldrick/bin32/as'])},
         ]

Modified: zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py?rev=115507&r1=115506&r2=115507&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMGCCBuilder.py Mon Oct  4 10:38:45 2010
@@ -13,8 +13,9 @@
                            triple=None, build=None, host=None, target=None,
                            useTwoStage=True, stage1_config='Release+Asserts',
                            stage2_config='Release+Asserts', make='make',
-                           extra_configure_args=[], verbose=False, env = {},
-                           defaultBranch='trunk', timeout=20):
+                           extra_configure_args=[], extra_languages=None,
+                           verbose=False, env = {}, defaultBranch='trunk',
+                           timeout=20):
   if build or host or target:
     if not build or not host or not target:
       raise ValueError,"Must specify all of 'build', 'host', 'target' if used."
@@ -103,8 +104,11 @@
                            workdir=".", env=env))
 
   # Configure llvm-gcc.
-  base_llvmgcc_configure_args = ["../llvm-gcc.src/configure",
-                                 "--enable-languages=c,c++"]
+  base_llvmgcc_configure_args = ["../llvm-gcc.src/configure"]
+  llvmgcc_languages = "--enable-languages=c,c++"
+  if extra_languages:
+    llvmgcc_languages = llvmgcc_languages + "," + extra_languages
+  base_llvmgcc_configure_args.append(llvmgcc_languages)
   if gxxincludedir:
     base_llvmgcc_configure_args.append('--with-gxx-include-dir=' + gxxincludedir)
   base_llvmgcc_configure_args.extend(extra_configure_args)