diff options
| author | Steven Knight <knight@baldmt.com> | 2005-03-24 04:34:57 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-03-24 04:34:57 (GMT) |
| commit | 60048594723379212ea848f28c761a00e03bf092 (patch) | |
| tree | 28f1532779e1eb9fa9361f5d6339a8bdbc53d34c | |
| parent | f93cc22229166ffa87e069f9e082cf05b82c55f6 (diff) | |
| download | SCons-60048594723379212ea848f28c761a00e03bf092.zip SCons-60048594723379212ea848f28c761a00e03bf092.tar.gz SCons-60048594723379212ea848f28c761a00e03bf092.tar.bz2 | |
Fix linkloc.py to work with newer env.subst() conventions. (Charles Crain)
| -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 |