From 096c962bfe4646274c08b2953d9fbaebb892a689 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Fri, 6 Sep 2013 23:23:07 -0700 Subject: Backport 0e97908 from WAF repository: symlink fix for OpenBSD Author: Thomas Nagy Signed-off-by: Matthieu Patou Reviewed-by: Kai Blin Autobuild-User(master): Kai Blin Autobuild-Date(master): Sat Sep 21 11:14:30 CEST 2013 on sn-devel-104 --- buildtools/wafadmin/Tools/ccroot.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildtools/wafadmin/Tools/ccroot.py b/buildtools/wafadmin/Tools/ccroot.py index f54c82f186..264bdc7f0f 100644 --- a/buildtools/wafadmin/Tools/ccroot.py +++ b/buildtools/wafadmin/Tools/ccroot.py @@ -597,9 +597,12 @@ def apply_vnum(self): path = self.install_path if not path: return - bld.install_as(path + os.sep + name3, node, env=self.env) - bld.symlink_as(path + os.sep + name2, name3) - bld.symlink_as(path + os.sep + libname, name3) + if self.env.DEST_OS == 'openbsd': + bld.install_as(path + os.sep + name2, node, env=self.env, chmod=self.link_task.chmod) + else: + bld.install_as(path + os.sep + name3, node, env=self.env) + bld.symlink_as(path + os.sep + name2, name3) + bld.symlink_as(path + os.sep + libname, name3) # the following task is just to enable execution from the build dir :-/ self.create_task('vnum', node, [node.parent.find_or_declare(name2), node.parent.find_or_declare(name3)]) -- cgit