Changeset 109 for trunk/kBuild

Timestamp:

Jun 24, 2004, 10:58:08 PM (21 years ago)

Author:

bird

Message:

fixed any regression.

File:

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

trunk/kBuild/footer.kmk

@@ -150 +150 @@
 define def_inherit_defaults_one
 ifndef $(target)_$(prop)
+ifndef $(target)_$(prop).$(BUILD_TARGET)
 ifdef $(prop)
 $$(eval $(target)_$(prop) := $($(prop)))
+endif
+ifdef $(prop).$(BUILD_TARGET)
+$$(eval $(target)_$(prop).$(BUILD_TARGET) := $($(prop).$(BUILD_TARGET)))
+endif
 endif
 endif
@@ -164 +169 @@
 ifdef $(target)_TEMPLATE
 ifeq ($(strip $(TEMPLATE_$($(target)_TEMPLATE)_TOOL) $(TEMPLATE_$($(target)_TEMPLATE)_TOOL.$(BUILD_TARGET))),)
-$$(foreach prop,TOOL TOOL.$(BUILD_TARGET), $$(eval $$(def_inherit_defaults_one)))
+$$(foreach prop,TOOL, $$(eval $$(def_inherit_defaults_one)))
 endif
 ifeq ($(strip $(TEMPLATE_$($(target)_TEMPLATE)_SDKS) $(TEMPLATE_$($(target)_TEMPLATE)_SDKS.$(BUILD_TARGET))),)
-$$(foreach prop,SDKS SDKS.$(BUILD_TARGET), $$(eval $$(def_inherit_defaults_one)))
+$$(foreach prop,SDKS, $$(eval $$(def_inherit_defaults_one)))
 endif
 else
-$$(foreach prop,TEMPLATE TOOL TOOL.$(BUILD_TARGET) SDKS SDKS.$(BUILD_TARGET) \
-        ,$$(eval $$(def_inherit_defaults_one)))
+$$(foreach prop,TEMPLATE TOOL SDKS, $$(eval $$(def_inherit_defaults_one)))
 endif
 endef
 # Inherit default properties.
+# !!!!!!THIS IS MESSY AND NOT NECESSARY!!!!!!
 $(foreach target, $(ALL_TARGETS),$(eval $(def_inherit_defaults)))