Changeset 2432 in kBuild

Timestamp:

Nov 29, 2010 4:50:27 PM (14 years ago)

Author:

bird

Message:

footer.kmk: bah, mistyped a local variable name in r2429. Ref #99.

File:

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

trunk/kBuild/footer.kmk

@@ -988 +988 @@
 define def_inherit_template_workaround_target
 local _tmpl         := $(firstword $($(target)_TEMPLATE) $(TEMPLATE))
-local _bld_type     := $(firstword $($(target)_BLD_TYPE)     $(TEMPLATE_$(tmpl)_BLD_TYPE)     $(KBUILD_TYPE))
-local _bld_trg      := $(firstword $($(target)_BLD_TRG)      $(TEMPLATE_$(tmpl)_BLD_TRG)      $(KBUILD_TARGET))
-local _bld_trg_arch := $(firstword $($(target)_BLD_TRG_ARCH) $(TEMPLATE_$(tmpl)_BLD_TRG_ARCH) $(KBUILD_TARGET_ARCH))
-local _bld_trg_cpu  := $(firstword $($(target)_BLD_TRG_CPU)  $(TEMPLATE_$(tmpl)_BLD_TRG_CPU)  $(KBUILD_TARGET_CPU))
+local _bld_type     := $(firstword $($(target)_BLD_TYPE)     $(TEMPLATE_$(_tmpl)_BLD_TYPE)     $(KBUILD_TYPE))
+local _bld_trg      := $(firstword $($(target)_BLD_TRG)      $(TEMPLATE_$(_tmpl)_BLD_TRG)      $(KBUILD_TARGET))
+local _bld_trg_arch := $(firstword $($(target)_BLD_TRG_ARCH) $(TEMPLATE_$(_tmpl)_BLD_TRG_ARCH) $(KBUILD_TARGET_ARCH))
+local _bld_trg_cpu  := $(firstword $($(target)_BLD_TRG_CPU)  $(TEMPLATE_$(_tmpl)_BLD_TRG_CPU)  $(KBUILD_TARGET_CPU))
 $(kb-exp-tmpl 1,$(target),$(_bld_trg),$(_bld_trg_arch),$(_bld_trg_cpu),$(_bld_type))
 endef # def_inherit_template_workaround_target
@@ -999 +999 @@
 define def_inherit_template_workaround_host
 local _tmpl         := $(firstword $($(target)_TEMPLATE) $(TEMPLATE))
-local _bld_type     := $(firstword $($(target)_BLD_TYPE)     $(TEMPLATE_$(tmpl)_BLD_TYPE)     $(KBUILD_TYPE))
-local _bld_trg      := $(firstword $($(target)_BLD_TRG)      $(TEMPLATE_$(tmpl)_BLD_TRG)      $(KBUILD_HOST))
-local _bld_trg_arch := $(firstword $($(target)_BLD_TRG_ARCH) $(TEMPLATE_$(tmpl)_BLD_TRG_ARCH) $(KBUILD_HOST_ARCH))
-local _bld_trg_cpu  := $(firstword $($(target)_BLD_TRG_CPU)  $(TEMPLATE_$(tmpl)_BLD_TRG_CPU)  $(KBUILD_HOST_CPU))
+local _bld_type     := $(firstword $($(target)_BLD_TYPE)     $(TEMPLATE_$(_tmpl)_BLD_TYPE)     $(KBUILD_TYPE))
+local _bld_trg      := $(firstword $($(target)_BLD_TRG)      $(TEMPLATE_$(_tmpl)_BLD_TRG)      $(KBUILD_HOST))
+local _bld_trg_arch := $(firstword $($(target)_BLD_TRG_ARCH) $(TEMPLATE_$(_tmpl)_BLD_TRG_ARCH) $(KBUILD_HOST_ARCH))
+local _bld_trg_cpu  := $(firstword $($(target)_BLD_TRG_CPU)  $(TEMPLATE_$(_tmpl)_BLD_TRG_CPU)  $(KBUILD_HOST_CPU))
 $(kb-exp-tmpl 1,$(target),$(_bld_trg),$(_bld_trg_arch),$(_bld_trg_cpu),$(_bld_type))
 endef # def_inherit_template_workaround_target