[07/11] nmk: Add collect-target-deps helper

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

Details

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

Patch hide | download patch | download mbox

diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
index 82b2876dc074..e55fd5726fe1 100644
--- a/scripts/nmk/scripts/build.mk
+++ b/scripts/nmk/scripts/build.mk
@@ -260,6 +260,12 @@  define collect-hostprogs-deps
                 deps-y += $(addprefix $(obj)/,$($(1)-objs:.o=.d))
         endif
 endef
+define collect-target-deps
+        ifeq ($(1),$(2))
+                deps-y += $(call objectify,$($(t)-lib-y:.o=.d))
+                deps-y += $(call objectify,$($(t)-obj-y:.o=.d))
+        endif
+endef
 define collect-deps
         ifneq ($(filter-out %.d,$(1)),)
                 ifneq ($(filter %.o %.i %.s,$(1)),)
@@ -273,11 +279,12 @@  define collect-deps
                 deps-y += $(lib-y:.o=.d)
         endif
         $(foreach t,$(hostprogs-y),$(eval $(call collect-hostprogs-deps,$(t),$(1))))
+        $(foreach t,$(target),$(eval $(call collect-target-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)))
                 $(foreach t,$(hostprogs-y),$(eval $(call collect-hostprogs-deps,$(t),$(t))))
+                $(foreach t,$(target),$(eval $(call collect-target-deps,$(t),$(t))))
         endif
 endef