From 0c7825cfc8dfcd6b84fe282c193af8f57453ceaa Mon Sep 17 00:00:00 2001 From: stevenknight Date: Sat, 7 Jun 2003 22:53:02 +0000 Subject: [PATCH] When linking long command lines, use a '.lnk' suffix on the temporary file name. (Charles Crain) git-svn-id: http://scons.tigris.org/svn/scons/trunk@702 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/CHANGES.txt | 5 +++++ src/engine/SCons/Platform/win32.py | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 0986d163..1222d441 100644 --- 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 bce50f49..6874d015 100644 --- 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 -- 2.26.2