Changeset 1034 for trunk/kBuild/tools/MINGW32.kmk

Timestamp:

Jun 4, 2007, 4:05:30 AM (18 years ago)

Author:

bird

Message:

MAYBE output. removed some obsolete stuff.

File:

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

trunk/kBuild/tools/MINGW32.kmk

@@ -196 +196 @@
 TOOL_MINGW32_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_MINGW32_LINK_LIBRARY_DEPORD =
-ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
 define TOOL_MINGW32_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
@@ -206 +205 @@
         $(QUIET)$(TOOL_MINGW32_AR) -M < $(out).ar-script
 endef
-else
-define TOOL_MINGW32_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
-        $(foreach o, $(objs)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
-        $(foreach srclib, $(othersrc)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
-        $(QUIET)$(APPEND) $(out).ar-script "SAVE"
-        $(QUIET)$(APPEND) $(out).ar-script "END"
-        $(QUIET)$(TOOL_MINGW32_AR) -M < $(out).ar-script
-endef
-endif
+
 
 
@@ -258 +246 @@
 # @param    $(custom_post)  Custom step invoked after linking.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_MINGW32_LINK_DLL_OUTPUT = $(outbase).a $(outbase).exp $(PATH_LIB)/$(notdir $(outbase)).exp $(PATH_LIB)/$(notdir $(outbase)).a
+TOOL_MINGW32_LINK_DLL_OUTPUT =
+TOOL_MINGW32_LINK_DLL_OUTPUT_MAYBE = $(outbase).a $(outbase).exp $(PATH_LIB)/$(notdir $(outbase)).exp $(PATH_LIB)/$(notdir $(outbase)).a
 ## @todo Find a better solution for installing the extra files (.a, .exp, .pdb, .map, etc).
 TOOL_MINGW32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\