Ticket #109: kbuild-005-gcc3omf_gen_implib_for_dll.patch

kBuild/tools/GCC3OMF.kmk

@@ -291 +291 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_GCC3OMF_LINK_DLL_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_GCC3OMF_LINK_DLL_OUTPUT_MAYBE = $(if $(filter KMK_NOIMPLIB,$(flags)),,$(PATH_STAGE_LIB)/$(notdir $(outbase)).lib)
 TOOL_GCC3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_GCC3OMF_LINK_DLL_DEPORD =
+TOOL_GCC3OMF_LINK_DLL_DEPORD = $(if $(filter KMK_NOIMPLIB,$(flags)),,$(call DIRDEP,$(PATH_STAGE_LIB)))
 define TOOL_GCC3OMF_LINK_DLL_CMDS
         $(QUIET)$(APPEND) -n $(outbase).rsp\
                 $(TOOL_GCC3OMF_LDFLAGS.dll)\
-                $(flags)\
+                $(filter-out KMK_%,$(flags))\
                 -o $(out)\
                 $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
@@ -304 +305 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 -Zmap=$(outbase).map
         $(QUIET)$(TOOL_GCC3OMF_LD) @$(outbase).rsp
+        $(if $(filter KMK_NOIMPLIB,$(flags)),, \
+                $(QUIET)$(TOOL_GCC3OMF_AR_IMP) -o $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(out))
         $(if $(filter %.res,$(objs)), \
                 $(QUIET)$(TOOL_GCC3OMF_RC) $(filter %.res,$(objs)) $(out))
 endef

kBuild/tools/GXX3OMF.kmk

@@ -291 +291 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_GXX3OMF_LINK_DLL_OUTPUT = $(outbase).map $(outbase).rsp
+TOOL_GXX3OMF_LINK_DLL_OUTPUT_MAYBE = $(if $(filter KMK_NOIMPLIB,$(flags)),,$(PATH_STAGE_LIB)/$(notdir $(outbase)).lib)
 TOOL_GXX3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_GXX3OMF_LINK_DLL_DEPORD =
+TOOL_GXX3OMF_LINK_DLL_DEPORD = $(if $(filter KMK_NOIMPLIB,$(flags)),,$(call DIRDEP,$(PATH_STAGE_LIB)))
 define TOOL_GXX3OMF_LINK_DLL_CMDS
         $(QUIET)$(APPEND) -n $(outbase).rsp\
                 $(TOOL_GXX3OMF_LDFLAGS.dll)\
-                $(flags)\
+                $(filter-out KMK_%,$(flags))\
                 -o $(out)\
                 $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
@@ -304 +305 @@
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 -Zmap=$(outbase).map
         $(QUIET)$(TOOL_GXX3OMF_LD) @$(outbase).rsp
+        $(if $(filter KMK_NOIMPLIB,$(flags)),, \
+                $(QUIET)$(TOOL_GXX3OMF_AR_IMP) -o $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(out))
         $(if $(filter %.res,$(objs)), \
                 $(QUIET)$(TOOL_GXX3OMF_RC) $(filter %.res,$(objs)) $(out))
 endef