Changeset 3256 for trunk/kBuild/tools

Timestamp:

Jan 2, 2019, 11:17:28 PM (7 years ago)

Author:

bird

Message:

GXX3.kmk,footer*.kmk: Turns out pch + kObjCache actually does help with build performance. Working on making the kObjCache bits more flexible by introducing a target level use_objcache variable during expansion.

File:

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

trunk/kBuild/tools/GXX3.kmk

@@ -130 +130 @@
 TOOL_GXX3_COMPILE_C_DEPEND =
 TOOL_GXX3_COMPILE_C_DEPORD =
-ifdef KBUILD_USE_KOBJCACHE
-TOOL_GXX3_COMPILE_C_USES_KOBJCACHE = 1
-TOOL_GXX3_COMPILE_C_OUTPUT = $(outbase).i
+TOOL_GXX3_COMPILE_C_OUTPUT         = $(if-expr "$(use_objcache)" != "",$(outbase).i,)
+TOOL_GXX3_COMPILE_C_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
 define TOOL_GXX3_COMPILE_C_CMDS
+if "$(use_objcache)" != ""
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).i\
@@ -145 +145 @@
                 -o $(obj)\
                 -
-        $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
-else # !KBUILD_USE_KOBJCACHE
-TOOL_GXX3_COMPILE_C_OUTPUT =
-define TOOL_GXX3_COMPILE_C_CMDS
+else
         $(QUIET)$(TOOL_GXX3_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
@@ -155 +151 @@
                 -o $(obj)\
                 $(abspath $(source))
+endif
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
-endif # !KBUILD_USE_KOBJCACHE
 
 
@@ -172 +168 @@
 # @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_OUTPUT = $(outbase).ii
+TOOL_GXX3_COMPILE_CXX_DEPEND         = $($(target)_1_GCC_PCH_FILE)
+TOOL_GXX3_COMPILE_CXX_DEPORD         =
+TOOL_GXX3_COMPILE_CXX_OUTPUT         = $(if-expr "$(use_objcache)" != "",$(outbase).ii,)
+TOOL_GXX3_COMPILE_CXX_USES_KOBJCACHE = $(if-expr "$(use_objcache)" != "",1,)
 define TOOL_GXX3_COMPILE_CXX_CMDS
+if "$(use_objcache)" != ""
         $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).ii\
@@ -190 +186 @@
                 -o $(obj)\
                 -
-        $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
-else # !KBUILD_USE_KOBJCACHE
-TOOL_GXX3_COMPILE_CXX_OUTPUT =
-define TOOL_GXX3_COMPILE_CXX_CMDS
+else
         $(QUIET)$(TOOL_GXX3_CXX) -c\
                 $(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
@@ -201 +193 @@
                 ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
                 $(abspath $(source))
+endif
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
-endif # !KBUILD_USE_KOBJCACHE