Changeset 206

Timestamp:

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

Author:

bird

Message:

Added support for merging libs.

Location:

trunk/kBuild/tools

Files:

• GCC3.kmk (modified) (1 diff)
• GCC3OMF.kmk (modified) (5 diffs)
• VCC70.kmk (modified) (4 diffs)

trunk/kBuild/tools/GCC3.kmk

@@ -131 +131 @@
 # @param        $(dirdep)   Directory creation dependency.
 # @param        $(deps)         Other dependencies.
-#
-# @param    $(outbase)  Output basename (full). Use this for list files and such.
+# @param        $(othersrc) Unhandled sources.
+#
+# @param    $(outbase)  Output basename (full). Use this for list files and such.
+
+define TOOL_GCC3_LINK_LIBRARY_ADDMODE
+
+        echo "ADDMOD $(o)" >> $$@.ar-script
+endef
+
+define TOOL_GCC3_LINK_LIBRARY_EXPAND_LIB
+
+        $(MKDIR) -p $(dir $(outbase))ar.extract/$(notdir $(srclib))
+        cd $(dir $(outbase))ar.extract/$(notdir $(srclib)) && $(TOOL_GCC3_AR) x $(srclib)
+        for o in `$(TOOL_GCC3_AR) t $(srclib)`; do echo "ADDMOD $(dir $(outbase))ar.extract/$(notdir $(srclib))/$$$${o}" >> $$@.ar-script; done
+endef
+
 define TOOL_GCC3_LINK_LIBRARY
-#$ (warning dbg: TOOL_GCC3_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
-$(lib): $(dirdep) $(objs) $(deps)
+#$ (warning dbg: TOOL_GCC3_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 $$@
+ifneq ($(strip $(filter %.a %.lib,$(othersrc))),,)
+        echo "CREATE $$@" > $$@.ar-script
+        $(foreach o, $(objs), $(TOOL_GCC3_LINK_LIBRARY_ADDMOD))
+        $(foreach srclib, $(filter %.a %.lib,$(othersrc)),$(TOOL_GCC3_LINK_LIBRARY_EXPAND_LIB))
+        echo "SAVE" >> $$@.ar-script
+        echo "END" >> $$@.ar-script
+        $(TOOL_GCC3_AR) -M < $$@.ar-script
+        $(RM) -Rf "$(dir $(outbase))ar.extract/"
+else
         $(TOOL_GCC3_AR) $(flags) $$@ $(objs)
+endif
 
 endef

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)))

trunk/kBuild/tools/VCC70.kmk

@@ -141 +141 @@
         $(call MSG_L1,Creating Library $$@)
         $(RM) -f $$@
-        $(TOOL_VCC70_AR) $(flags) /OUT:$(lib) $(subst /,\\,$(objs)) \
-                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def))
+        $(TOOL_VCC70_AR) $(flags) /OUT:$(lib) $(subst /,\\,$(objs) $(filter %.a %.lib,$(othersrc))) \
+        $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(def))
 
 endef
@@ -163 +163 @@
 define TOOL_VCC70_LINK_PROGRAM
 #$ (warning dbg: TOOL_VCC70_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) 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),)
@@ -201 +201 @@
 define TOOL_VCC70_LINK_SYSMOD
 #$ (warning dbg: TOOL_VCC70_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 %.exp %.res,$(othersrc))
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -239 +239 @@
 define TOOL_VCC70_LINK_DLL
 #$ (warning dbg: TOOL_VCC70_LINK_DLL: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
-$(dll): $(dirdep) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps)
+$(dll): $(dirdep) $(call DIRDEP,$(PATH_LIB)) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps) $(filter %.def %.exp %.res,$(othersrc))
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)