From 3bb4a0df36652821f77e674bca3e35d11254bc76 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 19 Apr 2021 12:57:38 +1200 Subject: [PATCH] heimdal_build: Make HEIMDAL_BINARY be based on HEIMDAL_SUBSYSTEM This is imporatant as it ensures that the warning -> error logic and overrides are done for source files directly listed in a HEIMDAL_BINARY and a HEIMDAL_SUBSYSTEM. Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- source4/heimdal_build/wscript_build | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 514cc72659f..10bf2687d23 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -317,17 +317,27 @@ def HEIMDAL_BINARY(binname, source, source = heimdal_paths(source) + obj_target = binname + '.heimdal.objlist' + + HEIMDAL_SUBSYSTEM(obj_target, + source = source, + deps = deps, + includes = includes, + cflags = cflags, + group = group, + use_hostcc = use_hostcc, + use_global_deps= use_global_deps) + bld.SAMBA_BINARY(binname, - source = source, - deps = deps, + source = '', + deps = obj_target, includes = includes, cflags = cflags, group = group, use_hostcc = use_hostcc, use_global_deps= use_global_deps, install_path = None, - install = install, - allow_warnings = True) + install = install) if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):