Changeset 2058 for trunk/kBuild

Timestamp:

Nov 6, 2008, 12:45:38 AM (17 years ago)

Author:

bird

Message:

footer.kmk: made KBUILD_SAFE_PARALLEL work again.

File:

• trunk/kBuild/footer.kmk (modified) (6 diffs)

trunk/kBuild/footer.kmk

@@ -3449 +3449 @@
 #$ (error _KBUILD_STRICT_PASS_ORDER=$(_KBUILD_STRICT_PASS_ORDER))
 
+ifeq ($(_KBUILD_STRICT_PASS_ORDER),strict)
+ ifndef KBUILD_SAFE_PARALLEL
+_KBUILD_STRICT_PASS_ORDER := strict_unsafe
+ endif
+endif
+
 
 ## Subdir
@@ -3475 +3481 @@
 define def_pass_strict
 $(eval tag:=_before)
-$(eval dep:=)
+$(eval dep:= )
 $(foreach subdir,  $(SUBDIRS_$(PASS))          $(SUBDIRS_$(PASS).$(KBUILD_TARGET))          $(SUBDIRS_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))         ,$(eval $(def_pass_subdir)))
 $(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(KBUILD_TARGET)) $(MAKEFILES_BEFORE_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),$(eval $(def_pass_makefile)))
@@ -3484 +3490 @@
 $(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(KBUILD_TARGET))  $(MAKEFILES_AFTER_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) ,$(eval $(def_pass_makefile)))
 
-ifdef KBUILD_SAFE_PARALLEL
 .NOTPARALLEL: pass_$(pass) pass_$(pass)_before pass_$(pass)_after pass_$(pass)_this
 .PHONY:       pass_$(pass) pass_$(pass)_before pass_$(pass)_after pass_$(pass)_this pass_$(pass)_doit
-pass_$(pass)_doit:      $(PASS_$(PASS)_trgs) $(foreach var,$(PASS_$(PASS)_vars),$(var))
+pass_$(pass)_doit:      $(PASS_$(PASS)_trgs) $(foreach var,$(PASS_$(PASS)_vars),$($(var)))
 pass_$(pass)_this:      pass_$(pass)_before
         + $$(QUIET)$$(MAKE) -f $$(MAKEFILE) pass_$(pass)_doit
 pass_$(pass)_after::    pass_$(pass)_this
 pass_$(pass):           pass_$(pass)_after
-else  # !KBUILD_SAFE_PARALLEL
+#$ (warning pass=$(pass) PASS=$(PASS): $(PASS_$(PASS)_trgs) $(PASS_$(PASS)_trgs) $(foreach var,$(PASS_$(PASS)_vars),$($(var))))
+endef # def_pass_strict
+$(eval-opt-var def_pass_strict)
+
+## Execute a pass, strict order.
+# @param        $(pass)         Lowercase pass name.
+# @param        $(PASS)         Uppercase pass name.
+define def_pass_strict_unsafe
+$(eval tag:=_before)
+$(eval dep:= )
+$(foreach subdir,  $(SUBDIRS_$(PASS))          $(SUBDIRS_$(PASS).$(KBUILD_TARGET))          $(SUBDIRS_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))         ,$(eval $(def_pass_subdir)))
+$(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(KBUILD_TARGET)) $(MAKEFILES_BEFORE_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),$(eval $(def_pass_makefile)))
+
+$(eval tag:=_after)
+$(eval dep:=pass_$(pass)_doit)
+$(foreach subdir,  $(SUBDIRS_AFTER_$(PASS))    $(SUBDIRS_AFTER_$(PASS).$(KBUILD_TARGET))    $(SUBDIRS_AFTER_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))   ,$(eval $(def_pass_subdir)))
+$(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(KBUILD_TARGET))  $(MAKEFILES_AFTER_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) ,$(eval $(def_pass_makefile)))
+
 .PHONY:       pass_$(pass) pass_$(pass)_before pass_$(pass)_after pass_$(pass)_doit
 .NOTPARALLEL: pass_$(pass) pass_$(pass)_before pass_$(pass)_after pass_$(pass)_doit
@@ -3501 +3523 @@
                 pass_$(pass)_doit \
                 pass_$(pass)_after
-endif # !KBUILD_SAFE_PARALLEL
-
 #$ (warning pass=$(pass) PASS=$(PASS): $(PASS_$(PASS)_trgs) $(PASS_$(PASS)_trgs) $(foreach var,$(PASS_$(PASS)_vars),$($(var))))
-endef # def_pass_strict
-$(eval-opt-var def_pass_strict)
+endef # def_pass_strict_unsafe
+$(eval-opt-var def_pass_strict_unsafe)
 
 ## Execute a pass, non-strict pass ordering.
@@ -3527 +3547 @@
 # @param        $(prev_pass)    The previous pass name.
 define def_pass_order_strict
-ifdef KBUILD_SAFE_PARALLEL
 .PHONY:       pass_$(pass)_order
 .NOTPARALLEL: pass_$(pass)_order
@@ -3533 +3552 @@
         %$$(call MSG_PASS,$$(if $$(PASS_$(PASS)),$$(PASS_$(PASS)),$(pass)))
         + $$(QUIET)$$(MAKE) -f $$(MAKEFILE) pass_$(pass)
-else  # !KBUILD_SAFE_PARALLEL
-.NOTPARALLEL: pass_$(pass)_order pass_$(pass)_banner
-.PHONY:       pass_$(pass)_order pass_$(pass)_banner
-pass_$(pass)_banner:
-        %$$(call MSG_PASS,$$(if $$(PASS_$(PASS)),$$(PASS_$(PASS)),$(pass)))
-pass_$(pass)_order: \
-                $(pass_prev) \
-                pass_$(pass)_banner \
-                pass_$(pass)
-endif # !KBUILD_SAFE_PARALLEL
 $(eval pass_prev := pass_$(pass)_order)
 endef # def_pass_order_strict
 $(eval-opt-var def_pass_order_strict)
+
+## Pass order, strict unsafe.
+# @param        $(pass)         Current pass name.
+# @param        $(prev_pass)    The previous pass name.
+define def_pass_order_strict_unsafe
+.NOTPARALLEL: pass_$(pass)_order pass_$(pass)_banner
+.PHONY:       pass_$(pass)_order pass_$(pass)_banner
+pass_$(pass)_banner: $(pass_prev)
+        %$$(call MSG_PASS,$$(if $$(PASS_$(PASS)),$$(PASS_$(PASS)),$(pass)))
+pass_$(pass)_order:  $(pass_prev) \
+                pass_$(pass)_banner \
+                pass_$(pass)
+$(eval pass_prev := pass_$(pass)_order)
+endef # def_pass_order_strict_unsafe
+$(eval-opt-var def_pass_order_strict_unsafe)
 
 ## Pass order, non-strict.