Changeset 2956 in kBuild

Timestamp:

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

Author:

bird

Message:

vccprecomp fixes

Location:

trunk/kBuild

Files:

• tools/VCC100.kmk (modified) (1 diff)
• tools/VCC100AMD64.kmk (modified) (2 diffs)
• tools/VCC100X86.kmk (modified) (2 diffs)
• units/vccprecomp.kmk (modified) (1 diff)

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)))

trunk/kBuild/units/vccprecomp.kmk

@@ -54 +54 @@
 # have to do for now.  The '-PCH' variant of the VCC tool, is defined together
 # with $(tool) and allow us to bypass the options and dependencies triggered
-# by _1_VCC_PCH_FILE and _1_VCC_COMMON_OBJ_PDB, and also make sure we don't get
-# circular dependencies by way of kDepObj and the debug info.
+# by _1_VCC_PCH_FILE, _1_VCC_COMMON_OBJ_PDB and _PCH_HDR, and also make sure we
+# don't get circular dependencies by way of kDepObj and the debug info.
 #
 define def_unit_vccprecomp_target_pre_2