Changeset 2956 for trunk/kBuild/tools

Timestamp:

Sep 21, 2016, 9:37:20 PM (9 years ago)

Author:

bird

Message:

vccprecomp fixes

Location:

trunk/kBuild/tools

Files:

• VCC100.kmk (modified) (1 diff)
• VCC100AMD64.kmk (modified) (2 diffs)
• VCC100X86.kmk (modified) (2 diffs)

trunk/kBuild/tools/VCC100.kmk

@@ -198 +198 @@
         $(QUIET)$(TOOL_VCC100_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(if-expr defined($(target)_VCC_PCH_HDR)\
-                ,-FI$($(target)_VCC_PCH_HDR) -Yu$($(target)_VCC_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
-                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
+                $(if-expr defined($(target)_PCH_HDR)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))

trunk/kBuild/tools/VCC100AMD64.kmk

@@ -205 +205 @@
                 -- $(TOOL_VCC100AMD64_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(if-expr defined($(target)_VCC_PCH_HDR)\
-                ,-FI$($(target)_VCC_PCH_HDR) -Yu$($(target)_VCC_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
-                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
+                $(if-expr defined($(target)_PCH_HDR)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
@@ -215 +215 @@
         $(QUIET)$(TOOL_VCC100AMD64_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(if-expr defined($(target)_VCC_PCH_HDR)\
-                ,-FI$($(target)_VCC_PCH_HDR) -Yu$($(target)_VCC_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
-                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
+                $(if-expr defined($(target)_PCH_HDR)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))

trunk/kBuild/tools/VCC100X86.kmk

@@ -198 +198 @@
                 -- $(TOOL_VCC100X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(if-expr defined($(target)_VCC_PCH_HDR)\
-                ,-FI$($(target)_VCC_PCH_HDR) -Yu$($(target)_VCC_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
-                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
+                $(if-expr defined($(target)_PCH_HDR)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))
@@ -208 +208 @@
         $(QUIET)$(TOOL_VCC100X86_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                $(if-expr defined($(target)_VCC_PCH_HDR)\
-                ,-FI$($(target)_VCC_PCH_HDR) -Yu$($(target)_VCC_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
-                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
+                $(if-expr defined($(target)_PCH_HDR)\
+                ,-FI$($(target)_PCH_HDR) -Yu$($(target)_PCH_HDR) -Fp$($(target)_1_VCC_PCH_FILE),)\
+                -Fd$(if-expr defined($(target)_1_VCC_COMMON_OBJ_PDB),$($(target)_1_VCC_COMMON_OBJ_PDB),$(outbase)-obj.pdb) \
                 -Fo$(obj)\
                 $(subst /,\\,$(abspath $(source)))