When linking long command lines, use a '.lnk' suffix on the temporary file name....

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 0986d1636a7621ffd9c64efa49bf911c7fda64b2..1222d4415c03ddfac04af95c8f876d9fa8efc7f6 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -15,6 +15,11 @@ RELEASE 0.15 - XXX
   - Fix handling of library prefixes when the subdirectory matches
     the prefix.
 
+  From Charles Crain:
+
+  - Use '.lnk' as the suffix on the temporary file for linking long
+    command lines (necessary for the Phar Lap linkloc linker).
+
   From Steven Knight:
 
   - SCons now enforces (with an error) that construction variables

diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py
index bce50f493d0a4e3c99d1843fb0bae1891d9f2d87..6874d0156eb09e16ab194da70caeea3bf1828a8d 100644 (file)
--- a/src/engine/SCons/Platform/win32.py
+++ b/src/engine/SCons/Platform/win32.py
@@ -68,7 +68,11 @@ class TempFileMunge:
             # a bug in Win32 that will use a forward slash as a path
             # delimiter.  Win32's link mistakes that for a command line
             # switch and barfs.
-            tmp = os.path.normpath(tempfile.mktemp())
+            #
+            # We use the .lnk suffix for the benefit of the Phar Lap
+            # linkloc linker, which likes to append an .lnk suffix if
+            # none is given.
+            tmp = os.path.normpath(tempfile.mktemp('.lnk'))
             native_tmp = SCons.Util.get_native_path(tmp)
 
             # The sh shell will try to escape the backslashes in the