sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

heimdal_build: Recurse to bld.SAMBA_BINARY()

Browse Source 
This reduces a little of the duplication added when it was thought
that having a distinct waf wrapper on heimdal might allow this to be
ported upstream.

It will also streamline building a dedicated fuzzing mode in Samba.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Andrew Bartlett 2019-11-04 14:42:24 +13:00 committed by Andreas Schneider
parent 92ce387ed0
commit dc5db1e8d8
2 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildtools/wafsamba/wafsamba.py
View File

@ -354,6 +354,7 @@ def SAMBA_BINARY(bld, binname, source,
local_include=True,
global_include=True,
subsystem_name=None,
allow_warnings=False,
pyembed=False,
vars=None,
subdir=None,
@ -382,6 +383,8 @@ def SAMBA_BINARY(bld, binname, source,
if group == 'binaries':
subsystem_group = 'main'
elif group == 'build_compilers':
subsystem_group = 'compiler_libraries'
else:
subsystem_group = group
@ -410,6 +413,7 @@ def SAMBA_BINARY(bld, binname, source,
global_include = global_include,
use_hostcc = use_hostcc,
pyext = pyembed,
allow_warnings = allow_warnings,
use_global_deps= use_global_deps)
bld.SET_BUILD_GROUP(group)

40
source4/heimdal_build/wscript_build
View File

@ -314,47 +314,19 @@ def HEIMDAL_BINARY(binname, source,
install_path=None):
'''define a Samba binary'''
if not SET_TARGET_TYPE(bld, binname, 'BINARY'):
return
source = heimdal_paths(source)
features = 'c cprogram symlink_bin install_bin'
obj_target = binname + '.objlist'
if group == 'build_compilers':
subsystem_group = 'compiler_libraries'
else:
subsystem_group = group
# first create a target for building the object files for this binary
# by separating in this way, we avoid recompiling the C files
# separately for the install binary and the build binary
HEIMDAL_SUBSYSTEM(obj_target,
bld.SAMBA_BINARY(binname,
source = source,
deps = deps,
includes = includes,
cflags = cflags,
group = subsystem_group,
group = group,
use_hostcc = use_hostcc,
use_global_deps= use_global_deps)
bld.set_group(group)
# the binary itself will depend on that object target
deps = to_list(deps)
deps.append(obj_target)
t = bld(
features = features,
source = [],
target = binname,
samba_deps = deps,
samba_includes = includes,
local_include = True,
top = True,
use_global_deps= use_global_deps,
install_path = None,
samba_install = install
)
install = install,
allow_warnings = True)
if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):