Changeset 3607 in kBuild for trunk

Timestamp:

Sep 9, 2024 2:50:55 PM (7 months ago)

Author:

bird

Message:

header.kmk: Move KB_FN_DO_PASS0_ON_TARGET up so we can use it from the Config.kmk files.

File:

• trunk/kBuild/header.kmk (modified) (2 diffs)

trunk/kBuild/header.kmk

@@ -858 +858 @@
 # @param    $1      normalized main target
 TARGET_PATH = $(PATH_TARGET)/$(1)
+
+##
+# An internal define used by subheader.kmk, subfooter.kmk, and
+# KB_FN_DO_PASS0_ON_TARGET.
+#
+# @param target    The target to process.
+#
+define def_subfooter_header_target_pass
+ ifndef $(target)_PATH
+  ifndef $(target)_DEFPATH
+   $(target)_DEFPATH := $(PATH_SUB_CURRENT)
+  endif
+  $(call KB_FN_ASSIGN_DEPRECATED,$(target)_PATH,$($(target)_DEFPATH), $(target)_DEFPATH)
+ else ifndef $(target)_DEFPATH
+  $(target)_DEFPATH := $($(target)_PATH)
+ endif
+ ifndef $(target)_MAKEFILE
+  $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
+ endif
+ ifndef $(target)_0_OUTDIR
+  $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
+  $(call KB_FN_ASSIGN_DEPRECATED,PATH_$(target),$($(target)_0_OUTDIR), $(target)_0_OUTDIR)
+ endif
+endef
+
+##
+# Function to call to set _0_OUTDIR, _DEFPATH, and _MAKEFILE earlier than subfooter.
+# Can be used to avoid exploiting double expansion.
+#
+# @param 1     The target name.
+KB_FN_DO_PASS0_ON_TARGET = $(foreach target,$1,$(if-expr defined($(target)_0_OUTDIR),,$(evalval def_subfooter_header_target_pass)))
 
 ##
@@ -1712 +1743 @@
 
 
-##
-# An internal define used by subheader.kmk, subfooter.kmk, and
-# KB_FN_DO_PASS0_ON_TARGET.
-#
-# @param target    The target to process.
-#
-define def_subfooter_header_target_pass
- ifndef $(target)_PATH
-  ifndef $(target)_DEFPATH
-   $(target)_DEFPATH := $(PATH_SUB_CURRENT)
-  endif
-  $(call KB_FN_ASSIGN_DEPRECATED,$(target)_PATH,$($(target)_DEFPATH), $(target)_DEFPATH)
- else ifndef $(target)_DEFPATH
-  $(target)_DEFPATH := $($(target)_PATH)
- endif
- ifndef $(target)_MAKEFILE
-  $(target)_MAKEFILE := $(MAKEFILE_CURRENT)
- endif
- ifndef $(target)_0_OUTDIR
-  $(target)_0_OUTDIR := $(call TARGET_PATH,$(target))
-  $(call KB_FN_ASSIGN_DEPRECATED,PATH_$(target),$($(target)_0_OUTDIR), $(target)_0_OUTDIR)
- endif
-endef
-
-##
-# Function to call to set _0_OUTDIR, _DEFPATH, and _MAKEFILE earlier than subfooter.
-# Can be used to avoid exploiting double expansion.
-#
-# @param 1     The target name.
-KB_FN_DO_PASS0_ON_TARGET = $(foreach target,$1,$(if-expr defined($(target)_0_OUTDIR),,$(evalval def_subfooter_header_target_pass)))
-
-
 #
 # Validate any KBUILD_BLD_TYPES additions and finally the KBUILD_TYPE.