Changeset 2895 in kBuild for trunk/kBuild/tools/VCC100AMD64.kmk

Timestamp:

Sep 8, 2016 1:28:37 PM (8 years ago)

Author:

bird

Message:

Use kObjDep more.

File:

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

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -78 +78 @@
  ifeq ($(KBUILD_HOST),win)
   ifneq ($(substr $(PATH_TOOL_VCC100AMD64_BIN),-9),x86_amd64)
-   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit --
+   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
   else
-   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit --
+   TOOL_VCC100AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
   endif
  endif
@@ -172 +172 @@
 TOOL_VCC100AMD64_COMPILE_C_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
 TOOL_VCC100AMD64_COMPILE_C_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
+ ifdef TOOL_VCC100AMD64_KSUBMIT
 define TOOL_VCC100AMD64_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) $(TOOL_VCC100AMD64_CC) -c\
+        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC100AMD64_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -179 +181 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
+endef
+ else
+define TOOL_VCC100AMD64_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_VCC100AMD64_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_VCC100AMD64_PDB,$(outbase)-obj,idb)
 endef
+ endif # !TOOL_VCC100AMD64_KSUBMIT
 endif # !KBUILD_USE_KOBJCACHE
 
@@ -220 +232 @@
 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,idb)
 TOOL_VCC100AMD64_COMPILE_CXX_OUTPUT_MAYBE = $(call TOOL_VCC100AMD64_PDB, $(outbase)-obj,pdb)
+ ifdef TOOL_VCC100AMD64_KSUBMIT
 define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) $(TOOL_VCC100AMD64_CXX) -c\
+        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                -- $(TOOL_VCC100AMD64_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -227 +241 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
+endef
+ else
+define TOOL_VCC100AMD64_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_VCC100AMD64_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_VCC100AMD64_PDB,$(outbase)-obj,idb)
 endef
+ endif # !TOOL_VCC100AMD64_KSUBMIT
 endif # !KBUILD_USE_KOBJCACHE