Index: /trunk/kBuild/footer-pass1.kmk
===================================================================
--- /trunk/kBuild/footer-pass1.kmk	(revision 2761)
+++ /trunk/kBuild/footer-pass1.kmk	(revision 2762)
@@ -145,4 +145,6 @@
  endif
 else
+ local inst :=
+ local stage :=
  $(target)_1_STAGE :=
  $(target)_1_STAGE_TARGET :=
@@ -245,5 +247,5 @@
 $(target)_INSTTYPE := none
 endif
-$(evalval def_pass1_link_common)
+$(evalvalctx def_pass1_link_common)
 endef
 
@@ -254,5 +256,5 @@
 bld_trg_base_var := PLATFORM
 $(foreach target, $(_ALL_BLDPROGS), \
-	$(evalval def_pass1_bldprog))
+	$(evalvalctx def_pass1_bldprog))
 
 
@@ -266,5 +268,5 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_LIBRARIES), \
-	$(evalval def_pass1_link_common))
+	$(evalvalctx def_pass1_link_common))
 
 
@@ -278,5 +280,5 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_DLLS), \
-	$(evalval def_pass1_link_common))
+	$(evalvalctx def_pass1_link_common))
 
 
@@ -294,5 +296,5 @@
  bld_trg_base_var := TARGET
  $(foreach target, $(_ALL_IMPORT_LIBS), \
-	$(evalval def_pass1_link_common))
+	$(evalvalctx def_pass1_link_common))
 else
  EXT     := DLL
@@ -302,5 +304,5 @@
  bld_trg_base_var := TARGET
  $(foreach target, $(_ALL_IMPORT_LIBS), \
-	$(evalval def_pass1_link_common))
+	$(evalvalctx def_pass1_link_common))
 endif
 
@@ -315,5 +317,5 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_PROGRAMS), \
-	$(evalval def_pass1_link_common))
+	$(evalvalctx def_pass1_link_common))
 
 
@@ -327,5 +329,5 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_SYSMODS), \
-	$(evalval def_pass1_link_common))
+	$(evalvalctx def_pass1_link_common))
 
 
@@ -339,5 +341,5 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_MISCBINS), \
-	$(evalval def_pass1_link_common))
+	$(evalvalctx def_pass1_link_common))
 
 
@@ -453,5 +455,5 @@
 
 $(foreach target, $(_ALL_INSTALLS), \
-	$(evalval def_pass1_install))
+	$(evalvalctx def_pass1_install))
 
 ifdef KBUILD_PROFILE_SELF
Index: /trunk/kBuild/footer-pass2-compiling-targets.kmk
===================================================================
--- /trunk/kBuild/footer-pass2-compiling-targets.kmk	(revision 2761)
+++ /trunk/kBuild/footer-pass2-compiling-targets.kmk	(revision 2762)
@@ -271,5 +271,5 @@
 	$($(target)_SOURCES.$(bld_trg_cpu))\
 	$($(target)_SOURCES.$(bld_type))\
-	,$(evalval def_src_handler_one) )
+	,$(evalvalctx def_src_handler_one) )
 
 $(foreach source,\
@@ -282,5 +282,5 @@
 	$($(target)_GEN_SOURCES_.$(bld_trg_cpu))\
 	$($(target)_GEN_SOURCES_.$(bld_type))\
-	,$(evalval def_src_handler_one) )
+	,$(evalvalctx def_src_handler_one) )
 endef # def_target_sources
 $(eval-opt-var def_target_sources)
@@ -407,5 +407,5 @@
   local debug_install_cmd := $(INSTALL)
   local debug_var         := INSTALL
-  $(foreach debug_inst, $($(target)_1_DEBUG_INST), $(evalval def_target_install_only_debug))
+  $(foreach debug_inst, $($(target)_1_DEBUG_INST), $(evalvalctx def_target_install_only_debug))
  endif
 
@@ -414,9 +414,9 @@
  local debug_var          := STAGE
  if1of ($($(target)_1_DEBUG_INSTTYPE), stage both)
-  $(foreach debug_inst, $($(target)_1_DEBUG_STAGE), $(evalval def_target_install_only_debug))
+  $(foreach debug_inst, $($(target)_1_DEBUG_STAGE), $(evalvalctx def_target_install_only_debug))
  endif
  if1of ($($(target)_1_INSTTYPE), stage both)
   ifndef debug_nostage
-   $(foreach debug_inst,$($(target)_1_STAGE), $(evalval def_target_install_only_debug))
+   $(foreach debug_inst,$($(target)_1_STAGE), $(evalvalctx def_target_install_only_debug))
   endif
  endif
@@ -489,5 +489,5 @@
 	$($(target)_USES.$(bld_type))\
 	$($(target)_USES)
-$(foreach unit,$(units),$(evalval def_unit_$(unit)_target_pre))
+$(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre))
 
 # source -> object
@@ -629,5 +629,5 @@
 tool_do := LINK_LIBRARY
 mode := 0644
-$(foreach target, $(_ALL_LIBRARIES), $(evalval def_lib))
+$(foreach target, $(_ALL_LIBRARIES), $(evalvalctx def_lib))
 
 ifdef KBUILD_PROFILE_SELF
@@ -692,5 +692,5 @@
 	$($(target)_USES.$(bld_type))\
 	$($(target)_USES)
-$(foreach unit,$(units),$(evalval def_unit_$(unit)_target_pre))
+$(foreach unit,$(units),$(evalvalctx def_unit_$(unit)_target_pre))
 
 # source -> object
@@ -968,5 +968,5 @@
 mode    := 0755
 bld_trg_base_var := PLATFORM
-$(foreach target, $(_ALL_BLDPROGS), $(evalval def_link_common))
+$(foreach target, $(_ALL_BLDPROGS), $(evalvalctx def_link_common))
 
 ifdef KBUILD_PROFILE_SELF
@@ -986,5 +986,5 @@
 mode    := 0644
 bld_trg_base_var := TARGET
-$(foreach target, $(_ALL_DLLS), $(evalval def_link_common))
+$(foreach target, $(_ALL_DLLS), $(evalvalctx def_link_common))
 
 ifdef KBUILD_PROFILE_SELF
@@ -1006,9 +1006,9 @@
  EXT     := LIB
  tool_do := LINK_LIBRARY
- $(foreach target, $(_ALL_IMPORT_LIBS), $(evalval def_lib))
+ $(foreach target, $(_ALL_IMPORT_LIBS), $(evalvalctx def_lib))
 else
  EXT     := DLL
  tool_do := LINK_DLL
- $(foreach target, $(_ALL_IMPORT_LIBS), $(evalval def_link_common))
+ $(foreach target, $(_ALL_IMPORT_LIBS), $(evalvalctx def_link_common))
 endif
 
@@ -1029,5 +1029,5 @@
 mode    := 0755
 bld_trg_base_var := TARGET
-$(foreach target, $(_ALL_PROGRAMS), $(evalval def_link_common))
+$(foreach target, $(_ALL_PROGRAMS), $(evalvalctx def_link_common))
 
 ifdef KBUILD_PROFILE_SELF
@@ -1047,5 +1047,5 @@
 mode    := 0644
 bld_trg_base_var := TARGET
-$(foreach target, $(_ALL_SYSMODS), $(evalval def_link_common))
+$(foreach target, $(_ALL_SYSMODS), $(evalvalctx def_link_common))
 
 ifdef KBUILD_PROFILE_SELF
@@ -1065,5 +1065,5 @@
 mode    := 0644
 bld_trg_base_var := TARGET
-$(foreach target, $(_ALL_MISCBINS), $(evalval def_link_common))
+$(foreach target, $(_ALL_MISCBINS), $(evalvalctx def_link_common))
 
 ifdef KBUILD_PROFILE_SELF