[cig-commits] r7647 - cs/buildbot/trunk/buildbot

[leif at geodynamics.org]

Author: leif
Date: 2007-07-11 17:52:34 -0700 (Wed, 11 Jul 2007)
New Revision: 7647

Modified:
   cs/buildbot/trunk/buildbot/bs.py
Log:
Add "CC=gcc" etc. to 'make' command line for projects w/o a
'configure' script (MAG, cigma).


Modified: cs/buildbot/trunk/buildbot/bs.py
===================================================================
--- cs/buildbot/trunk/buildbot/bs.py	2007-07-11 22:57:09 UTC (rev 7646)
+++ cs/buildbot/trunk/buildbot/bs.py	2007-07-12 00:52:34 UTC (rev 7647)
@@ -28,11 +28,17 @@
     """simply runs 'make'"""
 
     def buildSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs, line):
+        e = []
+        for var, value in env.iteritems():
+            if var.find('PATH') == -1:
+                # expand server-side environment variables
+                value = value % env
+                e.append("%s=%s" % (var, value))
         steps = [
             s(step.Compile,
               description=["compiling"] + desc,
               descriptionDone=desc + ["compile"],
-              command="make all",
+              command=["make"] + e + ["all"],
               workdir=workdir,
               env=env,
               haltOnFailure=True),