summaryrefslogtreecommitdiff
path: root/buildtools/wafadmin
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2015-02-02 21:08:25 +0100
committerKarolin Seeger <kseeger@samba.org>2015-03-09 22:01:08 +0100
commitd020a34650b4ab10408b6fb51a15e3f051c508f2 (patch)
tree9717221b74c232d681b138b12c331dee26acb108 /buildtools/wafadmin
parent5eb19c72788c8b361e06457cd970b1031bfbd5d3 (diff)
downloadsamba-d020a34650b4ab10408b6fb51a15e3f051c508f2.tar.gz
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 (cherry picked from commit a3adad7a1799703c6620d7e6590321d796291831) BUG: https://bugzilla.samba.org/show_bug.cgi?id=10476
Diffstat (limited to 'buildtools/wafadmin')
-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 d59cf266339..12ef4425210 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)