Index: /trunk/kBuild/footer.kmk
===================================================================
--- /trunk/kBuild/footer.kmk	(revision 591)
+++ /trunk/kBuild/footer.kmk	(revision 592)
@@ -423,6 +423,11 @@
 # Include tools & sdks
 #
-_TOOLS := $(TOOL.$(BUILD_TARGET)) $(TOOL.$(BUILD_TARGET_ARCH)) $(TOOL.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) $(TOOL.$(BUILD_PLATFORM)) $(TOOL.$(BUILD_PLATFORM_ARCH)) $(TOOL.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) $(TOOL)
-_SDKS  := $(SDKS.$(BUILD_TARGET)) $(SDKS.$(BUILD_TARGET_ARCH)) $(SDKS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) $(SDKS.$(BUILD_PLATFORM)) $(SDKS.$(BUILD_PLATFORM_ARCH)) $(SDKS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) $(SDKS)
+_TOOLS := $(TOOL.$(BUILD_TARGET))   $(TOOL.$(BUILD_TARGET_ARCH))   $(TOOL.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+          $(TOOL.$(BUILD_PLATFORM)) $(TOOL.$(BUILD_PLATFORM_ARCH)) $(TOOL.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
+	  $(TOOL)
+_SDKS  := $(SDKS.$(BUILD_TARGET))   $(SDKS.$(BUILD_TARGET_ARCH))   $(SDKS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
+          $(SDKS.$(BUILD_PLATFORM)) $(SDKS.$(BUILD_PLATFORM_ARCH)) $(SDKS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
+	  $(SDKS.$(BUILD_TYPE)) \
+	  $(SDKS)
 define def_tools_sdks_target_source
 $(eval _TOOLS += $(foreach prop, $(PROPS_TOOLS), \
@@ -442,4 +447,6 @@
 	$($(source)_SDKS.$(_bld_trg_arch)) \
 	$($(target)_$(source)_SDKS.$(_bld_trg_arch)) \
+	$($(source)_SDKS.$(BUILD_TYPE)) \
+	$($(target)_$(source)_SDKS.$(BUILD_TYPE)) \
 	$($(source)_SDKS) \
 	$($(target)_$(source)_SDKS))
@@ -622,5 +629,5 @@
 # @param    bld_trg_arch  Build target arch.
 # @param    bld_trg_cpu   Build target cpu.
-# @remark 	obsoleted by kBuild helpers in kmk. Only required for gmake compatbility.
+# @remark 	obsoleted by kBuild helpers in kmk. Only required for limited gmake compatbility.
 #
 define def_target_source_c_cpp_asm_old
@@ -640,8 +647,9 @@
 	$(TOOL_$(tool)_$(type)DEFS)\
 	$(TOOL_$(tool)_$(type)DEFS.$(bld_type))\
-	$(foreach sdk, $(SDKS.$(bld_trg)) \
-				   $(SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $(SDKS.$(bld_type)) \
-				   $(SDKS),\
+	$(foreach sdk, $(SDKS.$(bld_trg).$(bld_trg_arch)) \
+	               $(SDKS.$(bld_trg_arch)) \
+	               $(SDKS.$(bld_trg)) \
+	               $(SDKS.$(bld_type)) \
+	               $(SDKS),\
 		$(SDK_$(sdk)_DEFS)\
 		$(SDK_$(sdk)_DEFS.$(bld_type))\
@@ -668,8 +676,9 @@
 	$($(type)DEFS.$(bld_trg).$(bld_trg_arch))\
 	$($(type)DEFS.$(bld_trg_cpu))\
-	$(foreach sdk, $($(target)_SDKS.$(bld_trg)) \
-				   $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $($(target)_SDKS.$(bld_type)) \
-				   $($(target)_SDKS),\
+	$(foreach sdk, $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
+	               $($(target)_SDKS.$(bld_trg_arch)) \
+	               $($(target)_SDKS.$(bld_trg)) \
+	               $($(target)_SDKS.$(bld_type)) \
+	               $($(target)_SDKS),\
 		$(SDK_$(sdk)_DEFS)\
 		$(SDK_$(sdk)_DEFS.$(bld_type))\
@@ -696,8 +705,9 @@
 	$($(target)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
 	$($(target)_$(type)DEFS.$(bld_trg_cpu))\
-	$(foreach sdk, $($(source)_SDKS.$(bld_trg)) \
-				   $($(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $($(source)_SDKS.$(bld_type)) \
-				   $($(source)_SDKS),\
+	$(foreach sdk, $($(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
+	               $($(source)_SDKS.$(bld_trg_arch)) \
+	               $($(source)_SDKS.$(bld_trg)) \
+	               $($(source)_SDKS.$(bld_type)) \
+	               $($(source)_SDKS),\
 		$(SDK_$(sdk)_DEFS)\
 		$(SDK_$(sdk)_DEFS.$(bld_type))\
@@ -724,8 +734,9 @@
 	$($(source)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
 	$($(source)_$(type)DEFS.$(bld_trg_cpu))\
-	$(foreach sdk, $($(target)_$(source)_SDKS.$(bld_trg)) \
-				   $($(target)_$(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $($(target)_$(source)_SDKS.$(bld_type)) \
-				   $($(target)_$(source)_SDKS),\
+	$(foreach sdk, $($(target)_$(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
+	               $($(target)_$(source)_SDKS.$(bld_trg_arch)) \
+	               $($(target)_$(source)_SDKS.$(bld_trg)) \
+	               $($(target)_$(source)_SDKS.$(bld_type)) \
+	               $($(target)_$(source)_SDKS),\
 		$(SDK_$(sdk)_DEFS)\
 		$(SDK_$(sdk)_DEFS.$(bld_type))\
@@ -765,8 +776,9 @@
 	$($(target)_$(source)_INCS.$(bld_type))\
 	$($(target)_$(source)_INCS)\
-	$(foreach sdk, $($(target)_$(source)_SDKS.$(bld_trg)) \
-				   $($(target)_$(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $($(target)_$(source)_SDKS.$(bld_type)) \
-				   $($(target)_$(source)_SDKS),\
+	$(foreach sdk, $($(target)_$(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
+	               $($(target)_$(source)_SDKS.$(bld_trg_arch)) \
+	               $($(target)_$(source)_SDKS.$(bld_trg)) \
+	               $($(target)_$(source)_SDKS.$(bld_type)) \
+	               $($(target)_$(source)_SDKS),\
 		$(SDK_$(sdk)_$(type)INCS.$(bld_trg_cpu))\
 		$(SDK_$(sdk)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
@@ -793,8 +805,9 @@
 	$($(source)_INCS.$(bld_type))\
 	$($(source)_INCS)\
-	$(foreach sdk, $($(source)_SDKS.$(bld_trg)) \
-				   $($(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $($(source)_SDKS.$(bld_type)) \
-				   $($(source)_SDKS),\
+	$(foreach sdk, $($(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
+		       $($(source)_SDKS.$(bld_trg_arch)) \
+		       $($(source)_SDKS.$(bld_trg)) \
+		       $($(source)_SDKS.$(bld_type)) \
+		       $($(source)_SDKS),\
 		$(SDK_$(sdk)_$(type)INCS.$(bld_trg_cpu))\
 		$(SDK_$(sdk)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
@@ -821,8 +834,9 @@
 	$($(target)_INCS.$(bld_type))\
 	$($(target)_INCS)\
-	$(foreach sdk, $($(target)_SDKS.$(bld_trg)) \
-				   $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $($(target)_SDKS.$(bld_type)) \
-				   $($(target)_SDKS),\
+	$(foreach sdk, $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
+		       $($(target)_SDKS.$(bld_trg_arch)) \
+		       $($(target)_SDKS.$(bld_trg)) \
+		       $($(target)_SDKS.$(bld_type)) \
+		       $($(target)_SDKS),\
 		$(SDK_$(sdk)_$(type)INCS.$(bld_trg_cpu))\
 		$(SDK_$(sdk)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
@@ -843,8 +857,9 @@
 	$(INCS.$(bld_type))\
 	$(INCS)\
-	$(foreach sdk, $(SDKS.$(bld_trg)) \
-				   $(SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $(SDKS.$(bld_type)) \
-				   $(SDKS),\
+	$(foreach sdk, $(SDKS.$(bld_trg).$(bld_trg_arch)) \
+	               $(SDKS.$(bld_trg_arch)) \
+	               $(SDKS.$(bld_trg)) \
+	               $(SDKS.$(bld_type)) \
+	               $(SDKS),\
 		$(SDK_$(sdk)_$(type)INCS.$(bld_trg_cpu))\
 		$(SDK_$(sdk)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
@@ -1245,8 +1260,9 @@
 	$($(target)_LIBS.$(bld_type))\
 	$($(target)_LIBS)\
-	$(foreach sdk, $($(target)_SDKS.$(bld_trg)) \
-				   $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $($(target)_SDKS.$(bld_type)) \
-				   $($(target)_SDKS),\
+	$(foreach sdk, $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
+		       $($(target)_SDKS.$(bld_trg_arch)) \
+		       $($(target)_SDKS.$(bld_trg)) \
+		       $($(target)_SDKS.$(bld_type)) \
+		       $($(target)_SDKS),\
 		$(SDK_$(sdk)_LIBS.$(bld_trg_cpu))\
 		$(SDK_$(sdk)_LIBS.$(bld_trg).$(bld_trg_arch))\
@@ -1261,8 +1277,9 @@
 	$(LIBS.$(bld_type))\
 	$(LIBS)\
-	$(foreach sdk, $(SDKS.$(bld_trg)) \
-				   $(SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $(SDKS.$(bld_type)) \
-				   $(SDKS),\
+	$(foreach sdk, $(SDKS.$(bld_trg).$(bld_trg_arch)) \
+	               $(SDKS.$(bld_trg_arch)) \
+	               $(SDKS.$(bld_trg)) \
+	               $(SDKS.$(bld_type)) \
+	               $(SDKS),\
 		$(SDK_$(sdk)_LIBS.$(bld_trg_cpu))\
 		$(SDK_$(sdk)_LIBS.$(bld_trg).$(bld_trg_arch))\
@@ -1284,8 +1301,9 @@
 	$($(target)_LIBPATH.$(bld_type))\
 	$($(target)_LIBPATH)\
-	$(foreach sdk, $($(target)_SDKS.$(bld_trg)) \
-				   $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $($(target)_SDKS.$(bld_type)) \
-				   $($(target)_SDKS),\
+	$(foreach sdk, $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
+		       $($(target)_SDKS.$(bld_trg_arch)) \
+		       $($(target)_SDKS.$(bld_trg)) \
+		       $($(target)_SDKS.$(bld_type)) \
+		       $($(target)_SDKS),\
 		$(SDK_$(sdk)_LIBPATH.$(bld_trg_cpu))\
 		$(SDK_$(sdk)_LIBPATH.$(bld_trg).$(bld_trg_arch))\
@@ -1300,8 +1318,9 @@
 	$(LIBPATH.$(bld_type))\
 	$(LIBPATH)\
-	$(foreach sdk, $(SDKS.$(bld_trg)) \
-				   $(SDKS.$(bld_trg).$(bld_trg_arch)) \
-				   $(SDKS.$(bld_type)) \
-				   $(SDKS),\
+	$(foreach sdk, $(SDKS.$(bld_trg).$(bld_trg_arch)) \
+	               $(SDKS.$(bld_trg_arch)) \
+	               $(SDKS.$(bld_trg)) \
+	               $(SDKS.$(bld_type)) \
+	               $(SDKS),\
 		$(SDK_$(sdk)_LIBPATH.$(bld_trg_cpu))\
 		$(SDK_$(sdk)_LIBPATH.$(bld_trg).$(bld_trg_arch))\