Changeset 2960 for trunk/kBuild

Timestamp:

Sep 21, 2016, 10:57:40 PM (9 years ago)

Author:

bird

Message:

Rebuilt kmk and kWorker for windows against r2959 and changed VCC100*.kmk to use --no-pch-caching when creating precompiled headers.

Location:

trunk/kBuild

Files:

• bin/win.amd64/kWorker.exe (modified) ( previous)
• bin/win.amd64/kmk.exe (modified) ( previous)
• bin/win.x86/kWorker.exe (modified) ( previous)
• bin/win.x86/kmk.exe (modified) ( previous)
• tools/VCC100.kmk (modified) (1 diff)
• tools/VCC100AMD64.kmk (modified) (2 diffs)
• tools/VCC100X86.kmk (modified) (1 diff)

trunk/kBuild/tools/VCC100.kmk

@@ -223 +223 @@
 ifdef TOOL_VCC100_KSUBMIT
  define TOOL_VCC100-PCH_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+        $(QUIET)$(TOOL_VCC100_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100_CXX) -c -Yc\
-                $(filter-out $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
                 -Fd$($(target)_1_VCC_COMMON_OBJ_PDB) \

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -241 +241 @@
 ifdef TOOL_VCC100AMD64_KSUBMIT
  define TOOL_VCC100AMD64-PCH_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
+        $(QUIET)$(TOOL_VCC100AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100AMD64_CXX) -c -Yc\
-                $(filter-out $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
                 -Fd$($(target)_1_VCC_COMMON_OBJ_PDB) \
@@ -252 +253 @@
 else
  define TOOL_VCC100AMD64-PCH_COMPILE_CXX_CMDS
+        $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
         $(QUIET)$(TOOL_VCC100AMD64_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\

trunk/kBuild/tools/VCC100X86.kmk

@@ -234 +234 @@
 ifdef TOOL_VCC100X86_KSUBMIT
  define TOOL_VCC100X86-PCH_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+        $(QUIET)$(TOOL_VCC100X86_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
                 -- $(TOOL_VCC100X86_CXX) -c -Yc\
-                $(filter-out $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
                 -Fd$($(target)_1_VCC_COMMON_OBJ_PDB) \