mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
build: we don't need the special case for s3build any more
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
parent
a3aa71ea3a
commit
a94f7768d9
@ -50,12 +50,6 @@ def s3_fix_kwargs(bld, kwargs):
|
||||
s3dir = os.path.join(bld.env.srcdir, 'source3')
|
||||
s3reldir = os_path_relpath(s3dir, bld.curdir)
|
||||
|
||||
# cope with the fact that the s3 waf rules were originally written
|
||||
# assuming relative paths to source3/. This only triggers when using the
|
||||
# wscript rules in s3build/
|
||||
if bld.curdir.endswith("/s3build") and not 'subdir' in kwargs:
|
||||
kwargs['subdir'] = s3reldir
|
||||
|
||||
# the extra_includes list is relative to the source3 directory
|
||||
extra_includes = [ '.', 'include', 'lib' ]
|
||||
if bld.env.use_intree_heimdal:
|
||||
|
Loading…
Reference in New Issue
Block a user