[llvm-commits] [zorg] r110334 - /zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Aug  5 10:38:58 2010
New Revision: 110334

URL: http://llvm.org/viewvc/llvm-project?rev=110334&view=rev
Log:
buildbot: Add 'llvmgccdir' argument for LLVMBuilder.

Modified:
    zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py?rev=110334&r1=110333&r2=110334&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLVMBuilder.py Thu Aug  5 10:38:58 2010
@@ -16,7 +16,7 @@
                         valgrindLeakCheck=False, valgrindSuppressions=None,
                         jobs='%(jobs)s', timeout=20, make='make',
                         enable_shared=False, enable_targets=None, defaultBranch='trunk',
-                        config_name='Debug+Asserts'):
+                        llvmgccdir=None, config_name='Debug+Asserts'):
     f = buildbot.process.factory.BuildFactory()
 
     # Determine the build directory.
@@ -33,10 +33,14 @@
                   workdir='llvm'))
 
     # Force without llvm-gcc so we don't run afoul of Frontend test failures.
-    configure_args = ["./configure", "--without-llvmgcc", "--without-llvmgxx"]
+    configure_args = ["./configure"]
+    if llvmgccdir:
+        configure_args += ['--with-llvmgccdir=%s' % llvmgccdir]
+    else:
+        configure_args += ["--without-llvmgcc", "--without-llvmgxx"]
     configure_args += getConfigArgs(config_name)
     if enable_targets is not None:
-        configure_args.append('--enable-targets %s' % enable_targets)
+        configure_args.append('--enable-targets=%s' % enable_targets)
     if triple:
         configure_args += ['--build=%s' % triple,
                            '--host=%s' % triple,