Changeset 2182 in kBuild for trunk

Timestamp:

Jan 3, 2009 12:52:10 AM (16 years ago)

Author:

bird

Message:

header.kmk,VCC*.kmk: Quiet hack for kDepIDB. (DEP_IDB_Q - temporary)

Location:

trunk/kBuild

Files:

• header.kmk (modified) (1 diff)
• tools/VCC70.kmk (modified) (5 diffs)
• tools/VCC80.kmk (modified) (2 diffs)
• tools/VCC80AMD64.kmk (modified) (2 diffs)
• tools/VCC80X86.kmk (modified) (4 diffs)

trunk/kBuild/header.kmk

@@ -525 +525 @@
 DEP_IDB_INT := kmk_builtin_kDepIDB
 DEP_IDB     := $(DEP_IDB_INT)
+if $(KMK_REVISION) >= 2121 # temporary hack, remove after next build cycle.
+DEP_IDB_Q   := -q
+endif
 
 DEP_PRE     := $(KBUILD_BIN_PATH)/kDepPre$(HOSTSUFF_EXE)

trunk/kBuild/tools/VCC70.kmk

@@ -25 +25 @@
 #
 # As a special exception you are granted permission to include this file, via
-# the kmk include directive, as you wish without this in itself causing the 
-# resulting makefile, program or whatever to be covered by the GPL license. 
+# the kmk include directive, as you wish without this in itself causing the
+# resulting makefile, program or whatever to be covered by the GPL license.
 # This exception does not however invalidate any other reasons why the makefile,
 # program, whatever should not be covered the GPL.
@@ -136 +136 @@
 #               -Fo$(obj)\
 #               $(subst /,\\,$(outbase).i)
-#       $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
+#       $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
 #endef
 #else # !KBUILD_USE_KOBJCACHE
@@ -148 +148 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s $(DEP_IDB_Q) -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
 endef
 #endif # !KBUILD_USE_KOBJCACHE
@@ -184 +184 @@
 #               -Fo$(obj)\
 #               $(subst /,\\,$(outbase).ii)
-#       $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
+#       $(QUIET)$(DEP_IDB) -f -s -q -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
 #endef
 #else # !KBUILD_USE_KOBJCACHE
@@ -196 +196 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s $(DEP_IDB_Q) -o $(dep) -t $(obj) $(call TOOL_VCC70_PDB,$(outbase)-obj,idb)
 endef
 #endif # !KBUILD_USE_KOBJCACHE

trunk/kBuild/tools/VCC80.kmk

@@ -156 +156 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC80_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s $(DEP_IDB_Q) -o $(dep) -t $(obj) $(call TOOL_VCC80_PDB,$(outbase)-obj,idb)
 endef
 
@@ -184 +184 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC80_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s $(DEP_IDB_Q) -o $(dep) -t $(obj) $(call TOOL_VCC80_PDB,$(outbase)-obj,idb)
 endef
 

trunk/kBuild/tools/VCC80AMD64.kmk

@@ -135 +135 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC80AMD64_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s $(DEP_IDB_Q) -o $(dep) -t $(obj) $(call TOOL_VCC80AMD64_PDB,$(outbase)-obj,idb)
 endef
 
@@ -163 +163 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC80AMD64_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s $(DEP_IDB_Q) -o $(dep) -t $(obj) $(call TOOL_VCC80AMD64_PDB,$(outbase)-obj,idb)
 endef
 

trunk/kBuild/tools/VCC80X86.kmk

@@ -25 +25 @@
 #
 # As a special exception you are granted permission to include this file, via
-# the kmk include directive, as you wish without this in itself causing the 
-# resulting makefile, program or whatever to be covered by the GPL license. 
+# the kmk include directive, as you wish without this in itself causing the
+# resulting makefile, program or whatever to be covered by the GPL license.
 # This exception does not however invalidate any other reasons why the makefile,
 # program, whatever should not be covered the GPL.
@@ -136 +136 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC80X86_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s $(DEP_IDB_Q) -o $(dep) -t $(obj) $(call TOOL_VCC80X86_PDB,$(outbase)-obj,idb)
 endef
 
@@ -164 +164 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
-        $(QUIET)$(DEP_IDB) -f -s -o $(dep) -t $(obj) $(call TOOL_VCC80X86_PDB,$(outbase)-obj,idb)
+        $(QUIET)$(DEP_IDB) -f -s $(DEP_IDB_Q) -o $(dep) -t $(obj) $(call TOOL_VCC80X86_PDB,$(outbase)-obj,idb)
 endef
 
@@ -267 +267 @@
 TOOL_VCC80X86_LINK_DLL_DEPEND = $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
 TOOL_VCC80X86_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
-TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp 
+TOOL_VCC80X86_LINK_DLL_OUTPUT = $(outbase).map $(outbase).lib $(outbase).exp
 TOOL_VCC80X86_LINK_DLL_OUTPUT_MAYBE = $(outbase).pdb $(outbase).ilk $(out).manifest $(PATH_LIB)/$(notdir $(outbase)).lib $(PATH_LIB)/$(notdir $(outbase)).exp
 define TOOL_VCC80X86_LINK_DLL_CMDS