Changeset 3255 in kBuild

Timestamp:

Jan 2, 2019 7:14:57 PM (6 years ago)

Author:

bird

Message:

GXX3: Make precompiled headers work with the compiler cache. Though, it turns out to be slower with gcc 8.2.x than regular build w/o precompiled headers, but just to be feature complete...

File:

• trunk/kBuild/tools/GXX3.kmk (modified) (3 diffs)

trunk/kBuild/tools/GXX3.kmk

@@ -164 +164 @@
 # @param    $(source)   Source filename (relative).
 # @param    $(obj)      Object file name. This shall be (re)created by the compilation.
-# @param    $(dep)          Dependcy file. This shall be (re)created by the compilation.
+# @param    $(dep)      Dependcy file. This shall be (re)created by the compilation.
 # @param    $(flags)    Flags.
 # @param    $(defs)     Definitions. No -D or something.
 # @param    $(incs)     Includes. No -I or something.
 # @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)             Other dependencies.
+# @param    $(deps)     Other dependencies.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
+TOOL_GXX3_COMPILE_CXX_DEPEND = $($(target)_1_GCC_PCH_FILE)
 TOOL_GXX3_COMPILE_CXX_DEPORD =
 ifdef KBUILD_USE_KOBJCACHE
 TOOL_GXX3_COMPILE_CXX_USES_KOBJCACHE = 1
-TOOL_GXX3_COMPILE_CXX_DEPEND =
 TOOL_GXX3_COMPILE_CXX_OUTPUT = $(outbase).ii
 define TOOL_GXX3_COMPILE_CXX_CMDS
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).ii\
-                $(TOOL_GXX3_CXX) -E -o -\
+                $(TOOL_GXX3_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+                ,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
@@ -186 +187 @@
                 --kObjCache-cc $(obj)\
                 $(TOOL_GXX3_CXX) -c\
-                $(flags) -fpreprocessed -x c++\
+                $(flags) -fpreprocessed $(if-expr defined($(target)_PCH_HDR),-fpch-preprocess,) -x c++\
                 -o $(obj)\
                 -
@@ -192 +193 @@
 endef
 else # !KBUILD_USE_KOBJCACHE
-TOOL_GXX3_COMPILE_CXX_DEPEND = $($(target)_1_GCC_PCH_FILE)
 TOOL_GXX3_COMPILE_CXX_OUTPUT =
 define TOOL_GXX3_COMPILE_CXX_CMDS