[06/11] nmk: Add collect-hostprogs-deps helper

Submitted by Cyrill Gorcunov on July 12, 2018, 12:51 p.m.

Details

Message ID 20180712125142.8737-7-gorcunov@gmail.com
State Accepted
Series "build: Fix issue on simultaneous build"
Headers show

Commit Message

Cyrill Gorcunov July 12, 2018, 12:51 p.m.
Thus will include hostprogs deps only if requested.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 scripts/nmk/scripts/build.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
index dbf2bbf0a6f3..82b2876dc074 100644
--- a/scripts/nmk/scripts/build.mk
+++ b/scripts/nmk/scripts/build.mk
@@ -255,6 +255,11 @@  $(foreach t,$(libso-y),$(eval $(call gen-so-link-rules,$(t))))
 
 #
 # Figure out if the target we're building needs deps to include.
+define collect-hostprogs-deps
+        ifeq ($(1),$(2))
+                deps-y += $(addprefix $(obj)/,$($(1)-objs:.o=.d))
+        endif
+endef
 define collect-deps
         ifneq ($(filter-out %.d,$(1)),)
                 ifneq ($(filter %.o %.i %.s,$(1)),)
@@ -267,11 +272,12 @@  define collect-deps
         ifeq ($(lib-target),$(1))
                 deps-y += $(lib-y:.o=.d)
         endif
+        $(foreach t,$(hostprogs-y),$(eval $(call collect-hostprogs-deps,$(t),$(1))))
         ifneq ($(filter all $(filter-out $(builtin-target) $(lib-target), $(all-y)) $(hostprogs-y),$(1)),)
                 deps-y += $(obj-y:.o=.d)
                 deps-y += $(lib-y:.o=.d)
                 deps-y += $(foreach t,$(target),$(call objectify,$($(t)-lib-y:.o=.d)) $(call objectify,$($(t)-obj-y:.o=.d)))
-                deps-y += $(foreach t,$(hostprogs-y),$(addprefix $(obj)/,$($(t)-objs:.o=.d)))
+                $(foreach t,$(hostprogs-y),$(eval $(call collect-hostprogs-deps,$(t),$(t))))
         endif
 endef