Changeset 2762 for trunk/kBuild

Timestamp:

Jan 28, 2015, 7:17:54 PM (10 years ago)

Author:

bird

Message:

Use evalvalctx instead of evalval for most of the target processing to make sure there isn't leakage between tragets via supposedly local variables (which ended up being local at the foreach level instead of the evalval level). Avoid troubles like we had in def_pass1_link_common when PDBs was installed but not the actual binary, we ended up using the $(inst) value from the previous run. (VBoxDrv.sys w/ signing enabled.)

Location:

trunk/kBuild

Files:

• footer-pass1.kmk (modified) (11 diffs)
• footer-pass2-compiling-targets.kmk (modified) (13 diffs)

trunk/kBuild/footer-pass1.kmk

@@ -145 +145 @@
  endif
 else
+ local inst :=
+ local stage :=
  $(target)_1_STAGE :=
  $(target)_1_STAGE_TARGET :=
@@ -245 +247 @@
 $(target)_INSTTYPE := none
 endif
-$(evalval def_pass1_link_common)
+$(evalvalctx def_pass1_link_common)
 endef
 
@@ -254 +256 @@
 bld_trg_base_var := PLATFORM
 $(foreach target, $(_ALL_BLDPROGS), \
-        $(evalval def_pass1_bldprog))
+        $(evalvalctx def_pass1_bldprog))
 
 
@@ -266 +268 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_LIBRARIES), \
-        $(evalval def_pass1_link_common))
+        $(evalvalctx def_pass1_link_common))
 
 
@@ -278 +280 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_DLLS), \
-        $(evalval def_pass1_link_common))
+        $(evalvalctx def_pass1_link_common))
 
 
@@ -294 +296 @@
  bld_trg_base_var := TARGET
  $(foreach target, $(_ALL_IMPORT_LIBS), \
-        $(evalval def_pass1_link_common))
+        $(evalvalctx def_pass1_link_common))
 else
  EXT     := DLL
@@ -302 +304 @@
  bld_trg_base_var := TARGET
  $(foreach target, $(_ALL_IMPORT_LIBS), \
-        $(evalval def_pass1_link_common))
+        $(evalvalctx def_pass1_link_common))
 endif
 
@@ -315 +317 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_PROGRAMS), \
-        $(evalval def_pass1_link_common))
+        $(evalvalctx def_pass1_link_common))
 
 
@@ -327 +329 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_SYSMODS), \
-        $(evalval def_pass1_link_common))
+        $(evalvalctx def_pass1_link_common))
 
 
@@ -339 +341 @@
 bld_trg_base_var := TARGET
 $(foreach target, $(_ALL_MISCBINS), \
-        $(evalval def_pass1_link_common))
+        $(evalvalctx def_pass1_link_common))
 
 
@@ -453 +455 @@
 
 $(foreach target, $(_ALL_INSTALLS), \
-        $(evalval def_pass1_install))
+        $(evalvalctx def_pass1_install))
 
 ifdef KBUILD_PROFILE_SELF

trunk/kBuild/footer-pass2-compiling-targets.kmk

@@ -271 +271 @@
         $($(target)_SOURCES.$(bld_trg_cpu))\
         $($(target)_SOURCES.$(bld_type))\
-        ,$(evalval def_src_handler_one) )
+        ,$(evalvalctx def_src_handler_one) )
 
 $(foreach source,\
@@ -282 +282 @@
         $($(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 +407 @@
   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 +414 @@
  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 +489 @@
         $($(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 +629 @@
 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 +692 @@
         $($(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 +968 @@
 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 +986 @@
 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 +1006 @@
  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 +1029 @@
 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 +1047 @@
 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 +1065 @@
 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