Changeset 206 for trunk/kBuild/tools/GCC3OMF.kmk

Timestamp:

Dec 29, 2004, 8:43:09 PM (21 years ago)

Author:

bird

Message:

Added support for merging libs.

File:

• trunk/kBuild/tools/GCC3OMF.kmk (modified) (5 diffs)

trunk/kBuild/tools/GCC3OMF.kmk

@@ -130 +130 @@
 # @param        $(dirdep)   Directory creation dependency.
 # @param        $(deps)         Other dependencies.
+# @param        $(othersrc) Unhandled sources.
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_GCC3OMF_LINK_LIBRARY
-#$ (warning dbg: TOOL_GCC3OMF_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
-$(lib): $(dirdep) $(objs) $(deps)
+#$ (warning dbg: TOOL_GCC3OMF_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
+$(lib): $(dirdep) $(objs) $(deps) $(filter %.a %.lib,$(othersrc))
         $(call MSG_L1,Creating Library $$@)
         $(RM) -f $$@
-        $(TOOL_GCC3OMF_AR) $(flags) $$@ $(objs)
+        $(TOOL_GCC3OMF_AR) $(flags) $$@ $(objs) $(filter %.a %.lib,$(othersrc))
 
 endef
@@ -158 +159 @@
 define TOOL_GCC3OMF_LINK_PROGRAM
 #$ (warning dbg: TOOL_GCC3OMF_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
-$(exe): $(dirdep) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps)
+$(exe): $(dirdep) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(filter %.def, $(othersrc))
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -164 +165 @@
 endif
         $(TOOL_GCC3OMF_LD) $(flags) -o $$@ $(objs) \
-        $(foreach p,$(libpath), -L$(p)) \
-        $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
+                $(filter %.def, $(othersrc)) \
+                $(foreach p,$(libpath), -L$(p)) \
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
 ifneq ($(custom_post),)
         $(eval $(custom_post))
@@ -220 +222 @@
 define TOOL_GCC3OMF_LINK_SYSMOD
 #$ (warning dbg: TOOL_GCC3OMF_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
-$(sys): $(dirdep) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps)
+$(sys): $(dirdep) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(filter %.def, $(othersrc))
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -226 +228 @@
 endif
         $(TOOL_GCC3OMF_LD_SYSMOD) $(TOOL_GCC3OMF_LDFLAGS.sysmod) $(flags) -o $$@ $(objs) \
+                $(filter %.def, $(othersrc)) \
                 $(foreach p,$(libpath), -L$(p)) \
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))