Changeset 771 for trunk/kBuild/tools

Timestamp:

Jan 19, 2007, 5:47:15 AM (19 years ago)

Author:

bird

Message:

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

File:

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

trunk/kBuild/tools/MINGW32.kmk

@@ -65 +65 @@
 else
  # Resolve any fancy stuff once and for all.
- TOOL_MINGW32_PREFIX := 
+ TOOL_MINGW32_PREFIX :=
 endif
 
@@ -194 +194 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 TOOL_MINGW32_LINK_LIBRARY_OUTPUT = $(out).ar-script
+TOOL_MINGW32_LINK_LIBRARY_DEPORD =
+ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
+TOOL_MINGW32_LINK_LIBRARY_DEPEND = $(othersrc)
+define TOOL_MINGW32_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_MINGW32_AR) -M < $(out).ar-script
+endef
+else
 TOOL_MINGW32_LINK_LIBRARY_DEPEND = $(filter %.a %.lib,$(othersrc))
-TOOL_MINGW32_LINK_LIBRARY_DEPORD =
 define TOOL_MINGW32_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
@@ -206 +218 @@
         $(QUIET)$(TOOL_MINGW32_AR) -M < $(out).ar-script
 endef
+endif
 
 
@@ -249 +262 @@
 TOOL_MINGW32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
         $(filter %.def %.res,$(othersrc))
-TOOL_MINGW32_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB)) 
+TOOL_MINGW32_LINK_DLL_DEPORD = $(call DIRDEP,$(PATH_LIB))
 define TOOL_MINGW32_LINK_DLL_CMDS
         $(QUIET)$(TOOL_MINGW32_DLLWRAP) $(flags)\