diff options
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/linkloc.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 6f0691f..f677819 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -46,6 +46,11 @@ RELEASE 0.97 - XXX - Add a set of canned PathOption validators: PathExists (the default), PathIsFile, PathIsDir and PathIsDirCreate. + Charles Crain + + - Fix the PharLap linkloc.py module to use target+source arguments + when calling env.subst(). + From Matthew Doar: - Add support for .lex and .yacc file suffixes for Lex and Yacc files. diff --git a/src/engine/SCons/Tool/linkloc.py b/src/engine/SCons/Tool/linkloc.py index 867b788..3853855 100644 --- a/src/engine/SCons/Tool/linkloc.py +++ b/src/engine/SCons/Tool/linkloc.py @@ -69,7 +69,7 @@ class LinklocGenerator: if for_signature: # Expand the contents of any linker command files recursively subs = 1 - strsub = env.subst(self.cmdline) + strsub = env.subst(self.cmdline, target=target, source=source) while subs: strsub, subs = _re_linker_command.subn(repl_linker_command, strsub) return strsub |