diff options
| author | Steven Knight <knight@baldmt.com> | 2003-06-07 22:53:02 +0000 |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-06-07 22:53:02 +0000 |
| commit | 8fc3c77d320fb435cb9268d31c34a58b18a58b54 (patch) | |
| tree | a201a3fdb494c9143f75fdc13d19cb0fc5fd0390 /src | |
| parent | 418471d33635bb87b062ee77c565bc80c20b151c (diff) | |
| download | scons-8fc3c77d320fb435cb9268d31c34a58b18a58b54.tar.gz | |
When linking long command lines, use a '.lnk' suffix on the temporary file name. (Charles Crain)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 6 |
2 files changed, 10 insertions, 1 deletions
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 |