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

Timestamp:

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

Author:

bird

Message:

Use kObjDep more.

File:

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

trunk/kBuild/tools/VCC100X86.kmk

@@ -76 +76 @@
 ifdef TOOL_VCC100X86_USE_KSUBMIT
  ifeq ($(KBUILD_HOST),win)
-  TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit --
+  TOOL_VCC100X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
  endif
 endif
@@ -169 +169 @@
 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
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_CC) -c\
+        $(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 \
@@ -176 +178 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
+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
 
@@ -217 +229 @@
 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
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) $(TOOL_VCC100X86_CXX) -c\
+        $(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 \
@@ -224 +238 @@
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
+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