diff options
| author | Matthieu Patou <mat@matws.net> | 2013-09-06 23:23:07 -0700 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2013-09-21 11:14:30 +0200 |
| commit | 096c962bfe4646274c08b2953d9fbaebb892a689 (patch) | |
| tree | 5c670f79644691897e7f06e475e9235ba9adf77c /buildtools/wafadmin/Tools | |
| parent | d5eb3b225cf5815f703431e5b87c31b06a3ddfc2 (diff) | |
| download | samba-096c962bfe4646274c08b2953d9fbaebb892a689.tar.gz samba-096c962bfe4646274c08b2953d9fbaebb892a689.tar.bz2 samba-096c962bfe4646274c08b2953d9fbaebb892a689.zip | |
Backport 0e97908 from WAF repository: symlink fix for OpenBSD
Author: Thomas Nagy <tnagy1024@gmail.com>
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Kai Blin <kai@samba.org>
Autobuild-User(master): Kai Blin <kai@samba.org>
Autobuild-Date(master): Sat Sep 21 11:14:30 CEST 2013 on sn-devel-104
Diffstat (limited to 'buildtools/wafadmin/Tools')
| -rw-r--r-- | buildtools/wafadmin/Tools/ccroot.py | 9 |
1 files 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)]) |