Changeset 3254 in kBuild

Timestamp:

Jan 2, 2019 4:06:50 AM (6 years ago)

Author:

bird

Message:

GXX3.kmk: More precompiled header work.

File:

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

trunk/kBuild/tools/GXX3.kmk

@@ -199 +199 @@
                 -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
                 -o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-                ,-Winvalid-pch -H -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
+                ,-Winvalid-pch -include $(basename $($(target)_1_GCC_PCH_FILE)),) \
                 $(abspath $(source))
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
@@ -260 +260 @@
 ## Link library
 # @param    $(target)   Normalized main target name.
-# @param    $(out)              Library name.
+# @param    $(out)      Library name.
 # @param    $(objs)     Object files to put in the library.
 # @param    $(flags)    Flags.
 # @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)             Other dependencies.
+# @param    $(deps)     Other dependencies.
 # @param    $(othersrc) Unhandled sources.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
@@ -274 +274 @@
         $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
         $(QUIET)$(APPEND) -n $(out).ar-script \
-                $(foreach o,$(objs), 'ADDMOD $(o)') \
+                $(foreach o,$(filter-out %.h.gch,$(objs)), 'ADDMOD $(o)') \
                 $(foreach o,$(filter-out %.def %.imp %.dll,$(othersrc)), 'ADDLIB $(o)')
         $(if $(filter %.def %.imp %.dll,$(othersrc))\
@@ -306 +306 @@
 TOOL_GXX3_LINK_PROGRAM_DEPORD =
 define TOOL_GXX3_LINK_PROGRAM_CMDS
-        $(QUIET)$(TOOL_GXX3_LD) $(flags) -o $(out) $(objs)\
+        $(QUIET)$(TOOL_GXX3_LD) $(flags) -o $(out) $(filter-out %.h.gch,$(objs))\
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
@@ -342 +342 @@
         $(QUIET)$(TOOL_GXX3_LD) $(TOOL_GXX3_LDFLAGS.dll) $(flags) -o $(out)\
                 $(if $(filter-out win os2, $(KBUILD_TARGET)),$(call TOOL_GXX3_LD_SONAME,$(target),$(out)))\
-                $(objs)\
+                $(filter-out %.h.gch,$(objs))\
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\
@@ -376 +376 @@
 TOOL_GXX3_LINK_SYSMOD_DEPORD =
 define TOOL_GXX3_LINK_SYSMOD_CMDS
-        $(QUIET)$(TOOL_GXX3_LD_SYSMOD) $(TOOL_GXX3_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
+        $(QUIET)$(TOOL_GXX3_LD_SYSMOD) $(TOOL_GXX3_LDFLAGS.sysmod) $(flags) -o $(out) $(filter-out %.h.gch,$(objs))\
                 $(filter %.def, $(othersrc))\
                 $(foreach p,$(libpath), -L$(p))\