Changeset 594 in kBuild

Timestamp:

Nov 25, 2006 1:35:17 AM (18 years ago)

Author:

bird

Message:

Fixed a template inheritance bug.

File:

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

trunk/kBuild/footer.kmk

@@ -251 +251 @@
   # recursivly process the parent if it's inherting from somebody too.
   ifdef TEMPLATE_$(parent)_EXTENDS
-   ifneq ($(TEMPLATE_$(template)_EXTENDS_STATUS_),42)
+   ifneq ($(TEMPLATE_$(parent)_EXTENDS_STATUS_),42)
     # foreach will create 'template' in a new variable context hiding our current variable.
-    $(foreach template, $(TEMPLATE_$(parent)_EXTENDS), $(eval $(value def_template_extends)))
+    $(foreach template, $(parent), $(eval $(value def_template_extends)))
     parent := $(strip $(TEMPLATE_$(template)_EXTENDS))
    endif
@@ -260 +260 @@
   # inherit properties.
   $(foreach prop, $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED)\
-  $(addsuffix .$(BUILD_TARGET),                      $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-  $(addsuffix .$(BUILD_TARGET).$(BUILD_TARGET_ARCH), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-  $(addsuffix .$(BUILD_TARGET_ARCH),                 $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-  $(addsuffix .$(BUILD_TARGET_CPU),                  $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-  $(addsuffix .$(BUILD_TYPE),                        $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
-  ,$(eval $(def_template_extends_prop))) # exploits the 2 evaluation, so no value!
+    $(addsuffix .$(BUILD_TARGET),                      $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+    $(addsuffix .$(BUILD_TARGET).$(BUILD_TARGET_ARCH), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+    $(addsuffix .$(BUILD_TARGET_ARCH),                 $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+    $(addsuffix .$(BUILD_TARGET_CPU),                  $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+    $(addsuffix .$(BUILD_TYPE),                        $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
+    ,$(eval $(def_template_extends_prop))) # exploits the 2 evaluation, so no value!
 
   TEMPLATE_$(template)_EXTENDS_STATUS_ := 42