Changeset 772 for trunk/kBuild/tools/GCC32.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/GCC32.kmk (modified) (4 diffs)

trunk/kBuild/tools/GCC32.kmk

@@ -59 +59 @@
 # General Properties used by kBuild
 TOOL_GCC32_COBJSUFF         ?= .o
-TOOL_GCC32_CFLAGS           ?= 
+TOOL_GCC32_CFLAGS           ?=
 TOOL_GCC32_CFLAGS.debug     ?= -g
 TOOL_GCC32_CFLAGS.profile   ?= -g -O2 #-pg
@@ -68 +68 @@
 TOOL_GCC32_CXXOBJSUFF       ?= .o
 TOOL_GCC32_CXXOBJSUFF       ?= .o
-TOOL_GCC32_CXXFLAGS         ?= 
+TOOL_GCC32_CXXFLAGS         ?=
 TOOL_GCC32_CXXFLAGS.debug   ?= -g
 TOOL_GCC32_CXXFLAGS.profile ?= -g -O2 #-pg
@@ -172 +172 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_GCC32_LINK_LIBRARY_OUTPUT = $(out).ar-script
-TOOL_GCC32_LINK_LIBRARY_DEPEND = $(filter %.a %.lib,$(othersrc))
+TOOL_GCC32_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_GCC32_LINK_LIBRARY_DEPORD =
+ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
+define TOOL_GCC32_LINK_LIBRARY_CMDS
+        $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
+        $(QUIET)$(APPEND) -n $(out).ar-script \
+                $(foreach o,$(objs), 'ADDMOD $(o)') \
+                $(foreach o,$(othersrc)), 'ADDLIB $(o)')
+        $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
+        $(QUIET)$(APPEND) $(out).ar-script 'END'
+        $(QUIET)$(TOOL_GCC32_AR) -M < $(out).ar-script
+endef
+else
 define TOOL_GCC32_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,$(othersrc)\
                 ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
         $(QUIET)$(APPEND) $(out).ar-script "SAVE"
@@ -184 +195 @@
         $(QUIET)$(TOOL_GCC32_AR) -M < $(out).ar-script
 endef
+endif