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

Timestamp:

Jan 19, 2007, 6:00:33 AM (19 years ago)

Author:

bird

Message:

use append -n for creating the ar-script if available.

File:

• trunk/kBuild/tools/GCC3.kmk (modified) (4 diffs)

trunk/kBuild/tools/GCC3.kmk

@@ -60 +60 @@
 # General Properties used by kBuild
 TOOL_GCC3_COBJSUFF         ?= .o
-TOOL_GCC3_CFLAGS           ?= 
+TOOL_GCC3_CFLAGS           ?=
 TOOL_GCC3_CFLAGS.debug     ?= -g
 TOOL_GCC3_CFLAGS.profile   ?= -g -O2 #-pg
@@ -69 +69 @@
 TOOL_GCC3_CXXOBJSUFF       ?= .o
 TOOL_GCC3_CXXOBJSUFF       ?= .o
-TOOL_GCC3_CXXFLAGS         ?= 
+TOOL_GCC3_CXXFLAGS         ?=
 TOOL_GCC3_CXXFLAGS.debug   ?= -g
 TOOL_GCC3_CXXFLAGS.profile ?= -g -O2 #-pg
@@ -172 +172 @@
 # @param    $(othersrc) Unhandled sources.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC3_LINK_LIBRARY_OUTPUT = $(out).ar-script
-TOOL_GCC3_LINK_LIBRARY_DEPEND = $(filter %.a %.lib %.def %.imp,$(othersrc))
+TOOL_GCC3_LINK_LIBRARY_OUTPUT = $(out).ar-script $(outbase).imp.a
+TOOL_GCC3_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_GCC3_LINK_LIBRARY_DEPORD =
+ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
+define TOOL_GCC3_LINK_LIBRARY_CMDS
+        $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
+        $(QUIET)$(APPEND) -n $(out).ar-script \
+                $(foreach o,$(objs), 'ADDMOD $(o)') \
+                $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
+        $(if $(filter %.def %.imp,$(othersrc))\
+                ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
+                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
+        $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
+        $(QUIET)$(APPEND) $(out).ar-script 'END'
+        $(QUIET)$(TOOL_GCC3_AR) -M < $(out).ar-script
+endef
+else
 define TOOL_GCC3_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
         $(foreach o, $(objs)\
                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
-        $(foreach srclib, $(filter %.a %.lib,$(othersrc))\
+        $(foreach srclib, $(filter-out %.def %.imp,$(othersrc))\
                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
         $(if $(filter %.def %.imp,$(othersrc))\
@@ -188 +202 @@
         $(QUIET)$(TOOL_GCC3_AR) -M < $(out).ar-script
 endef
+endif