Fix linkloc.py to work with newer env.subst() conventions. (Charles Crain)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1265 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 6f0691ff863b3e06104759cc4e7810aee1ea001d..f6778193f1806bc6ff4fcde12d5fe943f79e1acd 100644 (file)
--- 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 867b788bf95af332e63abe3cf012ddd2eacd958d..38538554b810f43c3a5596f9cc996dbaf63c6f1b 100644 (file)
--- 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