From 6d7f7a2a743436e65432c6b2ed1037c7c4ad2477 Mon Sep 17 00:00:00 2001 From: David Rothenberger Date: Fri, 23 Aug 2013 13:08:01 -0700 Subject: cyglink: Fix variant-dir --- src/engine/SCons/Tool/cyglink.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/engine/SCons/Tool/cyglink.py b/src/engine/SCons/Tool/cyglink.py index 23c1adf..87716cf 100644 --- a/src/engine/SCons/Tool/cyglink.py +++ b/src/engine/SCons/Tool/cyglink.py @@ -44,10 +44,8 @@ def shlib_emitter(target, source, env): # Remove any "lib" after the prefix pre = env.subst('$SHLIBPREFIX') - dll_name = str(dll) - if dll_name[len(pre):len(pre)+3] == 'lib': - dll_name = pre + dll_name[len(pre)+3:] - dll = env.fs.File(dll_name) + if dll.name[len(pre):len(pre)+3] == 'lib': + dll.name = pre + dll.name[len(pre)+3:] orig_target = target target = [env.fs.File(dll)] -- cgit v0.12