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

Timestamp:

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

Author:

bird

Message:

Added support for merging libs.

File:

• trunk/kBuild/tools/GCC3.kmk (modified) (1 diff)

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