summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Util.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-11-21 16:18:50 (GMT)
committerSteven Knight <knight@baldmt.com>2004-11-21 16:18:50 (GMT)
commit8781e4655cea19b34cd062768d9f09b359fe9a09 (patch)
tree3b66939e6dc14061317ca19f3371b60c2272c215 /src/engine/SCons/Util.py
parentffc625f8cf332399ba754bf2ebe9e700e5122eac (diff)
downloadSCons-8781e4655cea19b34cd062768d9f09b359fe9a09.zip
SCons-8781e4655cea19b34cd062768d9f09b359fe9a09.tar.gz
SCons-8781e4655cea19b34cd062768d9f09b359fe9a09.tar.bz2
Fix Value node expansion in command-line strings. (Kevin Quick)
Diffstat (limited to 'src/engine/SCons/Util.py')
-rw-r--r--src/engine/SCons/Util.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index ec809b9..896abaf 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -493,7 +493,15 @@ def subst_dict(target, source):
dict['TARGET'] = Target_or_Source(tnl)
if source:
- snl = NLWrapper(source, lambda x: x.rfile().get_subst_proxy())
+ def get_src_subst_proxy(node):
+ try:
+ rfile = node.rfile
+ except AttributeError:
+ pass
+ else:
+ node = rfile()
+ return node.get_subst_proxy()
+ snl = NLWrapper(source, get_src_subst_proxy)
dict['SOURCES'] = Targets_or_Sources(snl)
dict['SOURCE'] = Target_or_Source(snl)