summaryrefslogtreecommitdiffstats
path: root/buildtools
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2015-02-02 21:08:25 +0100
committerMichael Adam <obnox@samba.org>2015-03-03 03:33:24 +0100
commita3adad7a1799703c6620d7e6590321d796291831 (patch)
tree4cbca11913dac6a2b616b3cffca4802a51b9d7b9 /buildtools
parent3c2cf5e0d637186f9b2855efc518f4a1cf4997a2 (diff)
downloadsamba-a3adad7a1799703c6620d7e6590321d796291831.tar.gz
samba-a3adad7a1799703c6620d7e6590321d796291831.tar.xz
samba-a3adad7a1799703c6620d7e6590321d796291831.zip
waf: Fix the build on openbsd
We have single-digit vnum='0', make the assignment deal with it Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Tue Mar 3 03:33:24 CET 2015 on sn-devel-104
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafadmin/Tools/ccroot.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafadmin/Tools/ccroot.py b/buildtools/wafadmin/Tools/ccroot.py
index d59cf26633..12ef442521 100644
--- a/buildtools/wafadmin/Tools/ccroot.py
+++ b/buildtools/wafadmin/Tools/ccroot.py
@@ -184,7 +184,9 @@ def get_target_name(self):
# the import lib file name stays unversionned.
name = name + '-' + nums[0]
elif self.env.DEST_OS == 'openbsd':
- pattern = '%s.%s.%s' % (pattern, nums[0], nums[1])
+ pattern = '%s.%s' % (pattern, nums[0])
+ if len(nums) >= 2:
+ pattern += '.%s' % nums[1]
return os.path.join(dir, pattern % name)