Changeset 2487 for trunk/kBuild/tools/VCC100AMD64.kmk

Timestamp:

Jul 21, 2011, 10:01:27 PM (14 years ago)

Author:

bird

Message:

tools\*.kmk: PATH_LIB -> PATH_STAGE_LIB; VCC 10.0 hacking.

File:

• trunk/kBuild/tools/VCC100AMD64.kmk (modified) (4 diffs)

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -154 +154 @@
 TOOL_VCC100AMD64_COMPILE_CXX_DEPEND =
 TOOL_VCC100AMD64_COMPILE_CXX_DEPORD =
+ifdef KBUILD_USE_KOBJCACHE
+TOOL_VCC100AMD64_COMPILE_CXX_USES_KOBJCACHE = 1
+TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) $(outbase).ii
+TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
+if 1
+define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
+        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
+                --named-pipe-compile $(subst /,\\,//./pipe/kObjCache/$(translate $(outbase),:,_)/$(notdir $(source)))\
+                --kObjCache-cpp $(outbase).ii\
+                $(TOOL_VCC100AMD64_CXX) -E\
+                $(flags)\
+                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(subst /,\\,$(abspath $(source))) \
+                --kObjCache-cc $(obj)\
+                windbg $(TOOL_VCC100AMD64_CXX) -c -TP\
+                $(flags)\
+                -Fd$(outbase)-obj.pdb \
+                -FD\
+                -Fo$(obj)\
+                $(subst /,\\,//./pipe/kObjCache/$(translate $(outbase),:,_)/$(notdir $(source)))
+        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
+endef
+else
+define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
+        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
+                --kObjCache-cpp $(outbase).ii\
+                $(TOOL_VCC100AMD64_CXX) -E\
+                $(flags)\
+                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(subst /,\\,$(abspath $(source))) \
+                --kObjCache-cc $(obj)\
+                $(TOOL_VCC100AMD64_CXX) -c -TP\
+                $(flags)\
+                -Fd$(outbase)-obj.pdb \
+                -FD\
+                -Fo$(obj)\
+                $(outbase).ii
+        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
+endef
+endif
+else  # !KBUILD_USE_KOBJCACHE
 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
@@ -165 +206 @@
         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
 endef
-
+endif # !KBUILD_USE_KOBJCACHE
 
 ## Compile resource source.
@@ -264 +305 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_VCC100AMD64_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_VCC100AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
+TOOL_VCC100AMD64_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_STAGE_LIB))
 TOOL_VCC100AMD64_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
-TOOL_VCC100AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
+TOOL_VCC100AMD64_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(PATH_STAGE_LIB)/$(notdir $(outbase)).exp
 define TOOL_VCC100AMD64_LINK_DLL_CMDS
         $(QUIET)$(TOOL_VCC100AMD64_LD) $(flags) \
@@ -281 +322 @@
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC100AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
-        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
-$(eval _DIRS += $(PATH_LIB))
+        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_STAGE_LIB)/
+$(eval _DIRS += $(PATH_STAGE_LIB))
 endef