Changeset 3128 in kBuild

Timestamp:

Dec 25, 2017 1:33:14 PM (7 years ago)

Author:

bird

Message:

kBuild/footer-pass2-compiling-targets.kmk: Made PRE_CMDS and POST_CMDS accumulative.

Location:

trunk/kBuild

Files:

• footer-pass2-compiling-targets.kmk (modified) (2 diffs)
• footer.kmk (modified) (1 diff)

trunk/kBuild/footer-pass2-compiling-targets.kmk

@@ -564 +564 @@
 
 # Custom pre-link actions.
-local pre_cmds  := $(evalcall def_fn_prop_get_first_defined,PRE_CMDS)
-local post_cmds := $(evalcall def_fn_prop_get_first_defined,POST_CMDS)
+local pre_cmds  := $(evalcall def_fn_prop_get_all_prefixed_priority_last,PRE_CMDS,$(NLTAB))
+local post_cmds := $(evalcall def_fn_prop_get_all_prefixed_priority_last,POST_CMDS,$(NLTAB))
 
 # eliminate this guy?
@@ -888 +888 @@
 
 # Custom pre/post-link actions.
-local pre_cmds      := $(evalcall def_fn_prop_get_first_defined,PRE_CMDS)
-local post_cmds     := $(evalcall def_fn_prop_get_first_defined,POST_CMDS)
+local pre_cmds      := $(evalcall def_fn_prop_get_all_prefixed_priority_last,PRE_CMDS,$(NLTAB))
+local post_cmds     := $(evalcall def_fn_prop_get_all_prefixed_priority_last,POST_CMDS,$(NLTAB))
 
 # eliminate this guy?

trunk/kBuild/footer.kmk

@@ -309 +309 @@
 
 
+##
+# Function for collecting properties, priority ones last.
+#
+# @param   1            The property name.
+# @param   2            The default property name, empty if none.
+# @note    Implicit parameters: target, bld_trg, bld_trg_arch, bld_trg_cpu, bld_type.
+# @returns All properties.
+#
+define def_fn_prop_get_all_priority_last
+local .RETURN := \
+    $($(target)_$(1)) \
+    $($(target)_$(1).$(bld_type)) \
+    $($(target)_$(1).$(bld_trg)) \
+    $($(target)_$(1).$(bld_trg_arch)) \
+    $($(target)_$(1).$(bld_trg_cpu)) \
+    $($(target)_$(1).$(bld_trg).$(bld_type)) \
+    $($(target)_$(1).$(bld_trg).$(bld_trg_arch)) \
+    $($(target)_$(1).$(bld_trg).$(bld_trg_arch).$(bld_type))
+endef # def_fn_prop_get_all_priority_last
+
+
+##
+# Function for collecting properties with prefixing, priority ones last.
+#
+# @param   1            The property name.
+# @param   2            Something like $(NLTAB).
+# @note    Implicit parameters: target, bld_trg, bld_trg_arch, bld_trg_cpu, bld_type.
+# @returns All properties.
+#
+define def_fn_prop_get_all_prefixed_priority_last
+local .RETURN := \
+    $(if $($(target)_$(1)),$(2),)$($(target)_$(1)) \
+    $(if $($(target)_$(1).$(bld_type)),$(2),)$($(target)_$(1).$(bld_type)) \
+    $(if $($(target)_$(1).$(bld_trg)),$(2),)$($(target)_$(1).$(bld_trg)) \
+    $(if $($(target)_$(1).$(bld_trg_arch)),$(2),)$($(target)_$(1).$(bld_trg_arch)) \
+    $(if $($(target)_$(1).$(bld_trg_cpu)),$(2),)$($(target)_$(1).$(bld_trg_cpu)) \
+    $(if $($(target)_$(1).$(bld_trg).$(bld_type)),$(2),)$($(target)_$(1).$(bld_trg).$(bld_type)) \
+    $(if $($(target)_$(1).$(bld_trg).$(bld_trg_arch)),$(2),)$($(target)_$(1).$(bld_trg).$(bld_trg_arch)) \
+    $(if $($(target)_$(1).$(bld_trg).$(bld_trg_arch).$(bld_type)),$(2),)$($(target)_$(1).$(bld_trg).$(bld_trg_arch).$(bld_type))
+endef # def_fn_prop_get_all_prefixed_priority_last
+
+
 #
 # The main body.