Changeset 1011 in kBuild

Timestamp:

Jun 2, 2007 5:39:18 PM (18 years ago)

Author:

bird

Message:

DONT_PURGE_OUTPUT and some corrections.

File:

• trunk/kBuild/tools/VCC70.kmk (modified) (5 diffs)

trunk/kBuild/tools/VCC70.kmk

@@ -115 +115 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
+TOOL_VCC70_COMPILE_C_DONT_PURGE_OUTPUT =
+TOOL_VCC70_COMPILE_C_DEPEND =
+TOOL_VCC70_COMPILE_C_DEPORD =
 ifdef USE_KOBJCACHE
 TOOL_VCC70_COMPILE_C_OUTPUT = $(call TOOL_VCC70_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC70_PDB, $(outbase)-obj,idb) $(outbase).i
-TOOL_VCC70_COMPILE_C_DEPEND =
-TOOL_VCC70_COMPILE_C_DEPORD =
 TOOL_VCC70_COMPILE_C_USESES_KOBJCACHE = 1
 define TOOL_VCC70_COMPILE_C_CMDS
@@ -124 +125 @@
                 $(TOOL_VCC70_CC) -E \
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fd$(outbase)-obj.pdb \
-                -FD\
-                -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source))) \
                 --kObjCache-cc $(obj) \
@@ -135 +133 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(outbase).i)
-endef
-#       $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
+endef
 else # !USE_KOBJCACHE
 TOOL_VCC70_COMPILE_C_OUTPUT = $(call TOOL_VCC70_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC70_PDB, $(outbase)-obj,idb)
-TOOL_VCC70_COMPILE_C_DEPEND =
-TOOL_VCC70_COMPILE_C_DEPORD =
 define TOOL_VCC70_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VCC70_CC) -c\
@@ -166 +162 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
+TOOL_VCC70_COMPILE_CXX_DONT_PURGE_OUTPUT =
+TOOL_VCC70_COMPILE_CXX_DEPEND =
+TOOL_VCC70_COMPILE_CXX_DEPORD =
 ifdef USE_KOBJCACHE
 TOOL_VCC70_COMPILE_CXX_OUTPUT = $(call TOOL_VCC70_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC70_PDB, $(outbase)-obj,idb) $(outbase).ii
-TOOL_VCC70_COMPILE_CXX_DEPEND =
-TOOL_VCC70_COMPILE_CXX_DEPORD =
-TOOL_VCC70_COMPILE_CXX_USESES_KOBJCACHE = 1
+TOOL_VCC70_COMPILE_CXX_USES_KOBJCACHE = 1
 define TOOL_VCC70_COMPILE_CXX_CMDS
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -r --kObjCache-cpp $(outbase).ii \
                 $(TOOL_VCC70_CC) -E \
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Fd$(outbase)-obj.pdb \
-                -FD\
-                -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source))) \
                 --kObjCache-cc $(obj) \
@@ -186 +180 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(outbase).ii)
-endef
-#       $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
+endef
 else # !USE_KOBJCACHE
 TOOL_VCC70_COMPILE_CXX_OUTPUT = $(call TOOL_VCC70_PDB, $(outbase)-obj,pdb) $(call TOOL_VCC70_PDB, $(outbase)-obj,idb)
-TOOL_VCC70_COMPILE_CXX_DEPEND =
-TOOL_VCC70_COMPILE_CXX_DEPORD =
 define TOOL_VCC70_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VCC70_CXX) -c\