self.target could be a node, which may break implib creation (shenchen)
authortnagy1024 <tnagy1024@f0382ac9-c320-0410-b3f0-b508d59f5a85>
Wed, 22 Dec 2010 19:55:03 +0000 (19:55 +0000)
committertnagy1024 <tnagy1024@f0382ac9-c320-0410-b3f0-b508d59f5a85>
Wed, 22 Dec 2010 19:55:03 +0000 (19:55 +0000)
git-svn-id: https://waf.googlecode.com/svn/trunk@10745 f0382ac9-c320-0410-b3f0-b508d59f5a85

waflib/Tools/ccroot.py

index f821c8f99b70a4f4ecf1080278d4a711b7351b9d..00553d5ca873e5fda96f2257278b781ecba8036f 100644 (file)
@@ -375,7 +375,11 @@ def apply_implib(self):
                return
 
        dll = self.link_task.outputs[0]
-       implib = self.env['implib_PATTERN'] % os.path.split(self.target)[1]
+       if isinstance(self.target, Node.Node):
+               name = self.target.name
+       else:
+               name = os.path.split(self.target)[1]
+       implib = self.env['implib_PATTERN'] % name
        implib = dll.parent.find_or_declare(implib)
        self.env.append_value('LINKFLAGS', self.env['IMPLIB_ST'] % implib.bldpath())
        self.link_task.outputs.append(implib)