FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue 1355 - openbsd fix for the link in the build directory

This commit is contained in:
Thomas Nagy 2013-09-03 23:17:05 +02:00
parent 673f34aae8
commit 2b2e79d7e4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
waflib/Tools/ccroot.py
View File

@ -493,16 +493,18 @@ def apply_vnum(self):
name3 = libname + '.' + self.vnum
name2 = libname + '.' + nums[0]
if self.env.DEST_OS == 'openbsd':
name3 = '%s.%s' % (name2, nums[1])
# add the so name for the ld linker - to disable, just unset env.SONAME_ST
if self.env.SONAME_ST:
v = self.env.SONAME_ST % name2
self.env.append_value('LINKFLAGS', v.split())
# 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)])
if self.env.DEST_OS == 'openbsd':
name3 = '%s.%s' % (name2, nums[1])
self.create_task('vnum', node, node.parent.find_or_declare(name3))
else:
self.create_task('vnum', node, [node.parent.find_or_declare(name2), node.parent.find_or_declare(name3)])
if getattr(self, 'install_task', None):
self.install_task.hasrun = Task.SKIP_ME