diff options
| author | Russel Winder <russel@winder.org.uk> | 2017-07-28 06:12:29 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2017-07-28 06:12:29 (GMT) |
| commit | 653e1c27e6359388093ae707f55ec96f6c1faabf (patch) | |
| tree | cc3b653516880f391a5f46b82ddca26695c51201 /src/engine/SCons/Tool | |
| parent | 61a7c43e98602536f1eecdae1a46475a7a0ab734 (diff) | |
| parent | a13f1e3f721c4b5d65f0a942d184c300718d0d57 (diff) | |
| download | SCons-653e1c27e6359388093ae707f55ec96f6c1faabf.zip SCons-653e1c27e6359388093ae707f55ec96f6c1faabf.tar.gz SCons-653e1c27e6359388093ae707f55ec96f6c1faabf.tar.bz2 | |
Merge mainline.
Diffstat (limited to 'src/engine/SCons/Tool')
| -rw-r--r-- | src/engine/SCons/Tool/linkloc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/linkloc.py b/src/engine/SCons/Tool/linkloc.py index bd643f7..c73852b 100644 --- a/src/engine/SCons/Tool/linkloc.py +++ b/src/engine/SCons/Tool/linkloc.py @@ -52,8 +52,8 @@ def repl_linker_command(m): # Replaces any linker command file directives (e.g. "@foo.lnk") with # the actual contents of the file. try: - f=open(m.group(2), "r") - return m.group(1) + f.read() + with open(m.group(2), "r") as f: + return m.group(1) + f.read() except IOError: # the linker should return an error if it can't # find the linker command file so we will remain quiet. |