Changeset 3305 in kBuild

Timestamp:

Jan 14, 2020 3:11:48 PM (5 years ago)

Author:

bird

Message:

header.kmk,footer.kmk: Moved _DEPFILES_INCLUDED definition to the header since the KB_FN_AUTO_CMD_DEPS_EX macros references it during makefile loading and would leave all it's .auto-dep files behind.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (1 diff)
• header.kmk (modified) (2 diffs)

trunk/kBuild/footer.kmk

@@ -95 +95 @@
 # Dependency files. (currently not on target level, only this global stuff)
 _DEPFILES        := $(DEPFILES)    $(DEPFILES.$(KBUILD_TARGET))      $(DEPFILES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))        $(DEPFILES.$(KBUILD_TARGET_ARCH))    $(DEPFILES.$(KBUILD_TARGET_CPU))     $(DEPFILES.$(KBUILD_TYPE))
-
-# included dependency files.
-_DEPFILES_INCLUDED :=
 
 

trunk/kBuild/header.kmk

@@ -971 +971 @@
 #
 
+## Included dependency files (used to be in footer.kmk).
+_DEPFILES_INCLUDED :=
+
 ## Temporary for the compile rule below.
 if "$(KBUILD_KMK_REVISION)" >= 3134
@@ -1004 +1007 @@
 # @param 1     recipe name
 # @param 2     dep file.
-KB_FN_AUTO_CMD_DEPS_EX = $(eval includedep $2)$(eval _DEPFILES_INCLUDED += $2)$1: .MUST_MAKE = $$(comp-cmds-ex $$(AUTO_CMD_DEP_$(translate $1,:,_)_PREV_CMDS),$$(commands $1),FORCE)
+KB_FN_AUTO_CMD_DEPS_EX = $(eval includedep $2$(NL)_DEPFILES_INCLUDED += $2)$1: .MUST_MAKE = $$(comp-cmds-ex $$(AUTO_CMD_DEP_$(translate $1,:,_)_PREV_CMDS),$$(commands $1),FORCE)
 
 ##