diff options
author | Steven Knight <knight@baldmt.com> | 2002-11-25 05:45:38 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2002-11-25 05:45:38 (GMT) |
commit | eaef3f7c8cd75bd92b75233bfbee8589f2b9e82b (patch) | |
tree | db91b1d35351b894de0af38d04c4f44365851a40 /src/engine | |
parent | e891e39fcc8671d7a5ad2073e866d85ad9c9e362 (diff) | |
download | SCons-eaef3f7c8cd75bd92b75233bfbee8589f2b9e82b.zip SCons-eaef3f7c8cd75bd92b75233bfbee8589f2b9e82b.tar.gz SCons-eaef3f7c8cd75bd92b75233bfbee8589f2b9e82b.tar.bz2 |
Fix the Win32 checks for an explicit import library and .def file.
Diffstat (limited to 'src/engine')
-rw-r--r-- | src/engine/SCons/Tool/mslink.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index 391cbfe..79bf1d8 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -118,10 +118,10 @@ def win32LibEmitter(target, source, env): break if not dll: raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX") - + if env.has_key("WIN32_INSERT_DEF") and \ env["WIN32_INSERT_DEF"] and \ - not '.def' in map(lambda x: os.path.split(str(x))[1], + not '.def' in map(lambda x: os.path.splitext(str(x))[1], source): # append a def file to the list of sources @@ -131,10 +131,10 @@ def win32LibEmitter(target, source, env): if env.has_key('PDB') and env['PDB']: env.SideEffect(env['PDB'], target) env.Precious(env['PDB']) - + if not no_import_lib and \ not env.subst("$LIBSUFFIX") in \ - map(lambda x: os.path.split(str(x))[1], target): + map(lambda x: os.path.splitext(str(x))[1], target): # Append an import library to the list of targets. target.append("%s%s%s" % (env.subst("$LIBPREFIX"), os.path.splitext(str(dll))[0], |