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

Timestamp:

Jul 27, 2012, 10:14:26 AM (13 years ago)

Author:

bird

Message:

VCC100*: Fixed kObjCache support.

File:

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

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -92 +92 @@
 
 TOOL_VCC100AMD64_COBJSUFF         ?= .obj
-TOOL_VCC100AMD64_CFLAGS           ?= -TC -c -nologo
+TOOL_VCC100AMD64_CFLAGS           ?= -TC -nologo
 TOOL_VCC100AMD64_CFLAGS.debug     ?= -Od -Zi
 TOOL_VCC100AMD64_CFLAGS.release   ?= -O2
@@ -100 +100 @@
 
 TOOL_VCC100AMD64_CXXOBJSUFF       ?= .obj
-TOOL_VCC100AMD64_CXXFLAGS         ?= -TP -c -nologo
+TOOL_VCC100AMD64_CXXFLAGS         ?= -TP -nologo
 TOOL_VCC100AMD64_CXXFLAGS.debug   ?= -Od -Zi
 TOOL_VCC100AMD64_CXXFLAGS.release ?= -O2
@@ -136 +136 @@
 TOOL_VCC100AMD64_COMPILE_C_DEPEND =
 TOOL_VCC100AMD64_COMPILE_C_DEPORD =
+TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
+ifdef KBUILD_USE_KOBJCACHE
+TOOL_VCC100AMD64_COMPILE_C_USES_KOBJCACHE = 1
+TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb) $(outbase).i
+define TOOL_VCC100AMD64_COMPILE_C_CMDS
+        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
+                --kObjCache-cpp $(outbase).i\
+                $(TOOL_VCC100AMD64_CC) -E\
+                $(flags)\
+                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(subst /,\\,$(abspath $(source))) \
+                --kObjCache-cc $(obj)\
+                $(TOOL_VCC100AMD64_CC) -c\
+                $(flags)\
+                -Fd$(outbase)-obj.pdb \
+                -FD\
+                -Fo$(obj)\
+                $(outbase).i
+        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
+endef
+else  # !KBUILD_USE_KOBJCACHE
 TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
-TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
 define TOOL_VCC100AMD64_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VCC100AMD64_CC) -c\
@@ -147 +167 @@
         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100AMD64_PDB,$(outbase)-obj,idb)
 endef
+endif # !KBUILD_USE_KOBJCACHE
 
 
@@ -164 +185 @@
 TOOL_VCC100AMD64_COMPILE_CXX_DEPEND =
 TOOL_VCC100AMD64_COMPILE_CXX_DEPORD =
+TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
 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\
@@ -195 +197 @@
                 $(subst /,\\,$(abspath $(source))) \
                 --kObjCache-cc $(obj)\
-                $(TOOL_VCC100AMD64_CXX) -c -TP\
+                $(TOOL_VCC100AMD64_CXX) -c\
                 $(flags)\
                 -Fd$(outbase)-obj.pdb \
@@ -203 +205 @@
         $(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)
 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VCC100AMD64_CXX) -c\
@@ -217 +217 @@
 endef
 endif # !KBUILD_USE_KOBJCACHE
+
+## @todo configure the assembler template.
 
 ## Compile resource source.