summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-09-18 07:44:41 (GMT)
committerSteven Knight <knight@baldmt.com>2003-09-18 07:44:41 (GMT)
commit1379d2829c9d41fb72675f0d64a291a3f5706d16 (patch)
tree61b4a238da260fecf696b3743d932423ed313151 /src/engine
parent727266233825f379a02fc3a32c1fa46d1ffb1fe8 (diff)
downloadSCons-1379d2829c9d41fb72675f0d64a291a3f5706d16.zip
SCons-1379d2829c9d41fb72675f0d64a291a3f5706d16.tar.gz
SCons-1379d2829c9d41fb72675f0d64a291a3f5706d16.tar.bz2
Expand construction variables on the values of SConscript() keyword arguments.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Script/SConscript.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index cc9562d..2de7d54 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -433,7 +433,12 @@ class SConsEnvironment(SCons.Environment.Base):
def SConscript(self, *ls, **kw):
ls = map(lambda l, self=self: self.subst(l), ls)
- return apply(_SConscript, [self.fs,] + ls, kw)
+ subst_kw = {}
+ for key, val in kw.items():
+ if SCons.Util.is_String(val):
+ val = self.subst(val)
+ subst_kw[key] = val
+ return apply(_SConscript, [self.fs,] + ls, subst_kw)
def SetOption(self, name, value):
name = self.subst(name)