Changeset 2951 for trunk/kBuild/tools/VCC100X86.kmk

Timestamp:

Sep 21, 2016, 1:14:43 PM (9 years ago)

Author:

bird

Message:

VCC100*.kmk: Use kDepObj, drop /FD and related idb-file, drop kObjCache support (useless thanks to slow preprocessing).

File:

• trunk/kBuild/tools/VCC100X86.kmk (modified) (2 diffs)

trunk/kBuild/tools/VCC100X86.kmk

@@ -150 +150 @@
 TOOL_VCC100X86_COMPILE_C_DEPEND =
 TOOL_VCC100X86_COMPILE_C_DEPORD =
-ifdef KBUILD_USE_KOBJCACHE
-TOOL_VCC100X86_COMPILE_C_USES_KOBJCACHE = 1
-TOOL_VCC100X86_COMPILE_C_OUTPUT = $(outbase).i
-TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE =
-define TOOL_VCC100X86_COMPILE_C_CMDS
-        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
-                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
-                --kObjCache-cpp $(outbase).i\
-                $(TOOL_VCC100X86_CC) -E\
-                $(subst -Zi,-Z7,$(flags))\
-                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(subst /,\\,$(abspath $(source))) \
-                --kObjCache-cc $(obj)\
-                $(TOOL_VCC100X86_CC) -c\
-                $(subst -Zi,-Z7,$(flags))\
-                -Fo$(obj)\
-                $(outbase).i
-endef
-else  # !KBUILD_USE_KOBJCACHE
-TOOL_VCC100X86_COMPILE_C_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
-TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
- ifdef TOOL_VCC100X86_KSUBMIT
-define TOOL_VCC100X86_COMPILE_C_CMDS
+TOOL_VCC100X86_COMPILE_C_OUTPUT =
+TOOL_VCC100X86_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
+ifdef TOOL_VCC100X86_KSUBMIT
+ TOOL_VCC100X86_COMPILE_C_DONT_PURGE_OUTPUT = 1 # speed
+ define TOOL_VCC100X86_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100X86_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
-                -FD\
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-endef
- else
-define TOOL_VCC100X86_COMPILE_C_CMDS
+ endef
+else
+ define TOOL_VCC100X86_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VCC100X86_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
-                -FD\
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
-endef
- endif # !TOOL_VCC100X86_KSUBMIT
-endif # !KBUILD_USE_KOBJCACHE
+        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
+ endef
+endif # !TOOL_VCC100X86_KSUBMIT
 
 
@@ -210 +189 @@
 TOOL_VCC100X86_COMPILE_CXX_DEPEND =
 TOOL_VCC100X86_COMPILE_CXX_DEPORD =
-ifdef KBUILD_USE_KOBJCACHE
-TOOL_VCC100X86_COMPILE_CXX_USES_KOBJCACHE = 1
-TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(outbase).ii
-TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE =
-define TOOL_VCC100X86_COMPILE_CXX_CMDS
-        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -O2 -r\
-                --make-dep-fix-case --make-dep-gen-stubs --make-dep-quiet --make-dep-file $(dep)\
-                --kObjCache-cpp $(outbase).ii\
-                $(TOOL_VCC100X86_CXX) -E\
-                $(subst -Zi,-Z7,$(flags))\
-                $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(subst /,\\,$(abspath $(source))) \
-                --kObjCache-cc $(obj)\
-                $(TOOL_VCC100X86_CXX) -c\
-                $(subst -Zi,-Z7,$(flags))\
-                -Fo$(obj)\
-                $(outbase).ii
-endef
-else  # !KBUILD_USE_KOBJCACHE
-TOOL_VCC100X86_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
-TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb)
- ifdef TOOL_VCC100X86_KSUBMIT
-define TOOL_VCC100X86_COMPILE_CXX_CMDS
+TOOL_VCC100X86_COMPILE_CXX_OUTPUT =
+TOOL_VCC100X86_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100X86_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC100X86_PDB, $(outbase)-obj,idb)
+ifdef TOOL_VCC100X86_KSUBMIT
+ TOOL_VCC100X86_COMPILE_CXX_DONT_PURGE_OUTPUT = 1 # speed
+ define TOOL_VCC100X86_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
-                -FD\
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-endef
- else
-define TOOL_VCC100X86_COMPILE_CXX_CMDS
+ endef
+else
+ define TOOL_VCC100X86_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VCC100X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
-                -FD\
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC100X86_PDB,$(outbase)-obj,idb)
-endef
- endif # !TOOL_VCC100X86_KSUBMIT
-endif # !KBUILD_USE_KOBJCACHE
+        $(QUIET)$(DEP_OBJ) -f -s -q -o $(dep) -t $(obj) $(obj)
+ endef
+endif # !TOOL_VCC100X86_KSUBMIT
 
 ## @todo configure the assembler template.