Changeset 3284 for trunk/kBuild/footer-pass2-compiling-targets.kmk

Timestamp:

Jan 5, 2019, 2:40:31 AM (7 years ago)

Author:

bird

Message:

footer-pass2-compiling-targets.kmk,units: Added a dedicated pass 2 variable for units to put their intermediates in so as to not mess with inheritance or for us to do silly things wrt expansion for every property variant. Only the new variable is now always listed as an order-only dependency for each source compilation rule.

File:

• trunk/kBuild/footer-pass2-compiling-targets.kmk (modified) (7 diffs)

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

@@ -92 +92 @@
  define def_target_source_rule_v3plus_objcache
 _OUT_FILES += $(outbase).koc
-$(outbase).koc +| $(obj) $(kbsrc_output) $(kbsrc_output_maybe) : $(kbsrc_depend) | $(kbsrc_depord) $(target_intermediate_vars)
+$$(outbase).koc +| $$(obj) $$(kbsrc_output) $$(kbsrc_output_maybe) : $$(kbsrc_depend) | $$(kbsrc_depord) $(target_intermediate_vars)
         %$$(call MSG_COMPILE,$(target),$(source),$$@,$(type))
 
@@ -546 +546 @@
 othersrc          :=
 $(target)_2_OBJS  :=
+$(target)_2_INTERMEDIATES =
 
 # kObjCache.
@@ -556 +557 @@
 local use_objcache :=
 endif
-
-# target level intermediates
-local target_intermediate_vars := $(foreach var, \
-        $(target)_INTERMEDIATES \
-        $(target)_INTERMEDIATES.$(bld_trg) \
-        $(target)_INTERMEDIATES.$(bld_trg).$(bld_trg_arch) \
-        $(target)_INTERMEDIATES.$(bld_trg_arch) \
-        $(target)_INTERMEDIATES.$(bld_trg_cpu) \
-        $(target)_INTERMEDIATES.$(bld_type) \
-        ,$(if-expr defined($(var)),$$$$($(var)),))
-#$(info target_intermediate_vars=$(target_intermediate_vars))
 
 # Do units pre source callouts.
@@ -577 +567 @@
 $(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre))
 $(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre_2))
+
+# target level intermediates
+local target_intermediate_vars := $$$$($(target)_2_INTERMEDIATES) $(foreach var, \
+        $(target)_INTERMEDIATES \
+        $(target)_INTERMEDIATES.$(bld_trg) \
+        $(target)_INTERMEDIATES.$(bld_trg).$(bld_trg_arch) \
+        $(target)_INTERMEDIATES.$(bld_trg_arch) \
+        $(target)_INTERMEDIATES.$(bld_trg_cpu) \
+        $(target)_INTERMEDIATES.$(bld_type) \
+        ,$(if-expr defined($(var)),$$$$($(var)),))
 
 # source -> object
@@ -772 +772 @@
 othersrc          :=
 $(target)_2_OBJS  :=
+$(target)_2_INTERMEDIATES =
 
 # kObjCache.
@@ -782 +783 @@
 local use_objcache :=
 endif
-
-# target level intermediates
-local target_intermediate_vars := $(foreach var, \
-        $(target)_INTERMEDIATES \
-        $(target)_INTERMEDIATES.$(bld_trg) \
-        $(target)_INTERMEDIATES.$(bld_trg).$(bld_trg_arch) \
-        $(target)_INTERMEDIATES.$(bld_trg_arch) \
-        $(target)_INTERMEDIATES.$(bld_trg_cpu) \
-        $(target)_INTERMEDIATES.$(bld_type) \
-        ,$(if-expr defined($(var)),$$$$($(var)),))
-#$(info target_intermediate_vars=$(target_intermediate_vars))
 
 # Do units pre source callouts.
@@ -803 +793 @@
 $(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre))
 $(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre_2))
+
+# target level intermediates
+local target_intermediate_vars := $$$$($(target)_2_INTERMEDIATES) $(foreach var, \
+        $(target)_INTERMEDIATES \
+        $(target)_INTERMEDIATES.$(bld_trg) \
+        $(target)_INTERMEDIATES.$(bld_trg).$(bld_trg_arch) \
+        $(target)_INTERMEDIATES.$(bld_trg_arch) \
+        $(target)_INTERMEDIATES.$(bld_trg_cpu) \
+        $(target)_INTERMEDIATES.$(bld_type) \
+        ,$(if-expr defined($(var)),$$$$($(var)),))
 
 # source -> object