diff options
author | William Deegan <bill@baddogconsulting.com> | 2020-12-08 21:16:27 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2020-12-08 21:16:27 (GMT) |
commit | f11bf4212220db1ae95cee7a1171085ac8c46777 (patch) | |
tree | 9ff3fa9e88bd4f4eba1c43f61f6a82ba6d62da24 | |
parent | aff086d5ef28af0ec6ce05fc2fde4f8aa9626598 (diff) | |
download | SCons-f11bf4212220db1ae95cee7a1171085ac8c46777.zip SCons-f11bf4212220db1ae95cee7a1171085ac8c46777.tar.gz SCons-f11bf4212220db1ae95cee7a1171085ac8c46777.tar.bz2 |
Fix no_import_lib for versioned cygwin/cyglink shared libraries. Was referencing the import lib to create symlinks even if import lib wasn't to be created
-rw-r--r-- | SCons/Tool/cyglink.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/SCons/Tool/cyglink.py b/SCons/Tool/cyglink.py index e85797b..363a602 100644 --- a/SCons/Tool/cyglink.py +++ b/SCons/Tool/cyglink.py @@ -120,14 +120,14 @@ def _lib_emitter(target, source, env, **kw): implib_target.attributes.shared = 1 target.append(implib_target) - symlinks = ImpLibSymlinkGenerator(env, implib_target, - implib_libtype=libtype, - generator_libtype=libtype + 'ImpLib') - if Verbose: - print("_lib_emitter: implib symlinks=%r" % StringizeLibSymlinks(symlinks)) - if symlinks: - EmitLibSymlinks(env, symlinks, implib_target, clean_targets=target[0]) - implib_target.attributes.shliblinks = symlinks + symlinks = ImpLibSymlinkGenerator(env, implib_target, + implib_libtype=libtype, + generator_libtype=libtype + 'ImpLib') + if Verbose: + print("_lib_emitter: implib symlinks=%r" % StringizeLibSymlinks(symlinks)) + if symlinks: + EmitLibSymlinks(env, symlinks, implib_target, clean_targets=target[0]) + implib_target.attributes.shliblinks = symlinks return (target, source) |