summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/mslink.py
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2015-08-06 17:14:50 (GMT)
committerDirk Baechle <dl9obn@darc.de>2015-08-06 17:14:50 (GMT)
commitf1dbc3edd79cfbc80e469377bf8d45624cc04d40 (patch)
tree819103cc2938aec5231da4cd07eac71ea6d90c06 /src/engine/SCons/Tool/mslink.py
parent1787f2cb6c75f45c6b0ac7a6c3c9c4b0ea95c5eb (diff)
parent2dd443706e2c6a2f85e9ac40a237fc2c73aab345 (diff)
downloadSCons-f1dbc3edd79cfbc80e469377bf8d45624cc04d40.zip
SCons-f1dbc3edd79cfbc80e469377bf8d45624cc04d40.tar.gz
SCons-f1dbc3edd79cfbc80e469377bf8d45624cc04d40.tar.bz2
Merged in dirkbaechle/scons : switch of core classes to slots, memoizer subsystem now uses decorators
Diffstat (limited to 'src/engine/SCons/Tool/mslink.py')
-rw-r--r--src/engine/SCons/Tool/mslink.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py
index 827161e..6606e10 100644
--- a/src/engine/SCons/Tool/mslink.py
+++ b/src/engine/SCons/Tool/mslink.py
@@ -216,7 +216,7 @@ def embedManifestDllCheck(target, source, env):
"""Function run by embedManifestDllCheckAction to check for existence of manifest
and other conditions, and embed the manifest by calling embedManifestDllAction if so."""
if env.get('WINDOWS_EMBED_MANIFEST', 0):
- manifestSrc = target[0].abspath + '.manifest'
+ manifestSrc = target[0].get_abspath() + '.manifest'
if os.path.exists(manifestSrc):
ret = (embedManifestDllAction) ([target[0]],None,env)
if ret:
@@ -230,7 +230,7 @@ def embedManifestExeCheck(target, source, env):
"""Function run by embedManifestExeCheckAction to check for existence of manifest
and other conditions, and embed the manifest by calling embedManifestExeAction if so."""
if env.get('WINDOWS_EMBED_MANIFEST', 0):
- manifestSrc = target[0].abspath + '.manifest'
+ manifestSrc = target[0].get_abspath() + '.manifest'
if os.path.exists(manifestSrc):
ret = (embedManifestExeAction) ([target[0]],None,env)
if ret: