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

Timestamp:

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

Author:

bird

Message:

VCC100*: Fixed kObjCache support.

File:

• trunk/kBuild/tools/VCC100.kmk (modified) (6 diffs)

trunk/kBuild/tools/VCC100.kmk

@@ -105 +105 @@
 
 TOOL_VCC100_COBJSUFF         ?= .obj
-TOOL_VCC100_CFLAGS           ?= -TC -c -nologo
+TOOL_VCC100_CFLAGS           ?= -TC -nologo
 TOOL_VCC100_CFLAGS.debug     ?= -Od -Zi
 TOOL_VCC100_CFLAGS.release   ?= -O2
@@ -113 +113 @@
 
 TOOL_VCC100_CXXOBJSUFF       ?= .obj
-TOOL_VCC100_CXXFLAGS         ?= -TP -c -nologo
+TOOL_VCC100_CXXFLAGS         ?= -TP -nologo
 TOOL_VCC100_CXXFLAGS.debug   ?= -Od -Zi
 TOOL_VCC100_CXXFLAGS.release ?= -O2
@@ -155 +155 @@
 TOOL_VCC100_COMPILE_C_DEPEND =
 TOOL_VCC100_COMPILE_C_DEPORD =
+TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
+ifdef KBUILD_USE_KOBJCACHE
+TOOL_VCC100_COMPILE_C_USES_KOBJCACHE = 1
+TOOL_VCC100_COMPILE_C_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb) $(outbase).i
+define TOOL_VCC100_COMPILE_C_CMDS
+        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
+                --kObjCache-cpp $(outbase).i\
+                $(TOOL_VCC100_CC) -E\
+                $(flags)\
+                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(subst /,\\,$(abspath $(source))) \
+                --kObjCache-cc $(obj)\
+                $(TOOL_VCC100_C) -c\
+                $(flags)\
+                -Fd$(outbase)-obj.pdb \
+                -FD\
+                -Fo$(obj)\
+                $(outbase).i
+        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
+endef
+else  # !KBUILD_USE_KOBJCACHE
 TOOL_VCC100_COMPILE_C_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
-TOOL_VCC100_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
 define TOOL_VCC100_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VCC100_CC) -c\
@@ -166 +186 @@
         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
 endef
+endif # !KBUILD_USE_KOBJCACHE
 
 
@@ -183 +204 @@
 TOOL_VCC100_COMPILE_CXX_DEPEND =
 TOOL_VCC100_COMPILE_CXX_DEPORD =
+TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
+ifdef KBUILD_USE_KOBJCACHE
+TOOL_VCC100_COMPILE_CXX_USES_KOBJCACHE = 1
+TOOL_VCC100_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb) $(outbase).ii
+define TOOL_VCC100_COMPILE_CXX_CMDS
+        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -r\
+                --kObjCache-cpp $(outbase).ii\
+                $(TOOL_VCC100_CXX) -E\
+                $(flags)\
+                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(subst /,\\,$(abspath $(source))) \
+                --kObjCache-cc $(obj)\
+                $(TOOL_VCC100_CXX) -c\
+                $(flags)\
+                -Fd$(outbase)-obj.pdb \
+                -FD\
+                -Fo$(obj)\
+                $(outbase).ii
+        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
+endef
+else  # !KBUILD_USE_KOBJCACHE
 TOOL_VCC100_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100_PDB, $(outbase)-obj,idb)
-TOOL_VCC100_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100_PDB, $(outbase)-obj,pdb)
 define TOOL_VCC100_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VCC100_CXX) -c\
@@ -194 +235 @@
         $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100_PDB,$(outbase)-obj,idb)
 endef
-
+endif # !KBUILD_USE_KOBJCACHE
+
+## @todo configure the assembler template.
 
 ## Compile resource source.