Changeset 846 in kBuild for trunk

Timestamp:

Feb 4, 2007 2:37:42 PM (18 years ago)

Author:

bird

Message:

Fixed busted compile templates and implemented library merging.

File:

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

trunk/kBuild/tools/GCC.kmk

@@ -32 +32 @@
 TOOL_GCC_AS  ?= gcc$(HOSTSUFF_EXE)
 TOOL_GCC_AR  ?= ar$(HOSTSUFF_EXE)
+TOOL_GCC_RANLIB ?= ranlib$(HOSTSUFF_EXE)
 TOOL_GCC_LD  ?= g++$(HOSTSUFF_EXE)
 TOOL_GCC_LDFLAGS.dll.os2 ?= -Zdll
+TOOL_GCC_LDFLAGS.dll.darwin ?= -dynamiclib
 ifndef TOOL_GCC_LDFLAGS.$(BUILD_TARGET)
 TOOL_GCC_LDFLAGS.dll ?= -shared
@@ -90 +92 @@
         $(QUIET)$(TOOL_GCC_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(out) \
-                -o $(out)\
+                -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+                -o $(obj)\
                 $(abspath $(source))
 endef
@@ -115 +117 @@
         $(QUIET)$(TOOL_GCC_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(out) \
-                -o $(out)\
+                -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+                -o $(obj)\
                 $(abspath $(source))
 endef
@@ -140 +142 @@
         $(QUIET)$(TOOL_GCC_AS) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(out) \
-                -o $(out)\
+                -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+                -o $(obj)\
                 $(abspath $(source))
 endef
@@ -160 +162 @@
 define TOOL_GCC_LINK_LIBRARY_CMDS
         $(QUIET)$(TOOL_GCC_AR) $(flags) $(out) $(objs)
+        $(call xargs,$(QUIET)$(TOOL_GCC_AR) $(flags) $(out),$(objs))
+        $(foreach lib,$(othersrc)\
+                ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \
+                $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))ar.tmp.dir/* \
+                $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \
+                $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \
+                        && $(TOOL_GCC_AR) x $(abspath $(lib)) \
+                        && $(TOOL_GCC_AR) $(flags) $(out) *) \
+                $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \
+                $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/)
+        $(QUIET)$(TOOL_GCC_RANLIB) $(out)
 endef