Changeset 1057 in kBuild

Timestamp:

Jun 11, 2007 9:38:18 AM (18 years ago)

Author:

bird

Message:

Disabled the USE_KOBJCACHE stuff in VCC70 as it is now outdated and it screwed up dependencies.

File:

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

trunk/kBuild/tools/VCC70.kmk

@@ -118 +118 @@
 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_USESES_KOBJCACHE = 1
-define TOOL_VCC70_COMPILE_C_CMDS
-        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -r --kObjCache-cpp $(outbase).i \
-                $(TOOL_VCC70_CC) -E \
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(subst /,\\,$(abspath $(source))) \
-                --kObjCache-cc $(obj) \
-                $(TOOL_VCC70_CC) -c -TC\
-                $(flags) \
-                -Fd$(outbase)-obj.pdb \
-                -FD\
-                -Fo$(obj)\
-                $(subst /,\\,$(outbase).i)
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
-endef
-else # !USE_KOBJCACHE
+#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_USESES_KOBJCACHE = 1
+#define TOOL_VCC70_COMPILE_C_CMDS
+#       $(QUIET)$(KOBJCACHE) -f $(outbase).koc -r --kObjCache-cpp $(outbase).i \
+#               $(TOOL_VCC70_CC) -E \
+#               $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+#               $(subst /,\\,$(abspath $(source))) \
+#               --kObjCache-cc $(obj) \
+#               $(TOOL_VCC70_CC) -c -TC\
+#               $(flags) \
+#               -Fd$(outbase)-obj.pdb \
+#               -FD\
+#               -Fo$(obj)\
+#               $(subst /,\\,$(outbase).i)
+#       $(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)
 define TOOL_VCC70_COMPILE_C_CMDS
@@ -146 +146 @@
         $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
 endef
-endif # !USE_KOBJCACHE
+#endif # !USE_KOBJCACHE
 
 
@@ -165 +165 @@
 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_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))\
-                $(subst /,\\,$(abspath $(source))) \
-                --kObjCache-cc $(obj) \
-                $(TOOL_VCC70_CC) -c -TP\
-                $(flags) \
-                -Fd$(outbase)-obj.pdb \
-                -FD\
-                -Fo$(obj)\
-                $(subst /,\\,$(outbase).ii)
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
-endef
-else # !USE_KOBJCACHE
+#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_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))\
+#               $(subst /,\\,$(abspath $(source))) \
+#               --kObjCache-cc $(obj) \
+#               $(TOOL_VCC70_CC) -c -TP\
+#               $(flags) \
+#               -Fd$(outbase)-obj.pdb \
+#               -FD\
+#               -Fo$(obj)\
+#               $(subst /,\\,$(outbase).ii)
+#       $(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)
 define TOOL_VCC70_COMPILE_CXX_CMDS
@@ -193 +193 @@
         $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
 endef
-endif # !USE_KOBJCACHE
+#endif # !USE_KOBJCACHE
 
 
@@ -232 +232 @@
 TOOL_VCC70_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_VCC70_LINK_LIBRARY_DEPORD =
-TOOL_VCC70_LINK_LIBRARY_OUTPUT = $(outbase).rsp 
-TOOL_VCC70_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb 
+TOOL_VCC70_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VCC70_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).lst $(outbase).exp $(outbase).pdb
 define TOOL_VCC70_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) -n $(outbase).rsp \
@@ -289 +289 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VCC70_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp 
+TOOL_VCC70_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
 TOOL_VCC70_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk
 TOOL_VCC70_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)