Changeset 752 for trunk/kBuild/tools

Timestamp:

Jan 6, 2007, 2:37:35 AM (19 years ago)

Author:

bird

Message:

Fixed library linking: It was still using $(lib) - this was changed to $(out) a some time ago.

File:

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

trunk/kBuild/tools/MINGW32.kmk

@@ -187 +187 @@
 ## Link library
 # @param    $(target)   Normalized main target name.
-# @param    $(lib)      Library name.
+# @param    $(out)      Library name.
 # @param    $(objs)     Object files to put in the library.
 # @param    $(flags)    Flags.
@@ -194 +194 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_MINGW32_LINK_LIBRARY_OUTPUT = $(lib).ar-script
+TOOL_MINGW32_LINK_LIBRARY_OUTPUT = $(out).ar-script
 TOOL_MINGW32_LINK_LIBRARY_DEPEND = $(filter %.a %.lib,$(othersrc))
 TOOL_MINGW32_LINK_LIBRARY_DEPORD =
 define TOOL_MINGW32_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) $(lib).ar-script "CREATE $(out)"
+        $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
         $(foreach o, $(objs)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(lib).ar-script "ADDMOD $(o)")
+                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
         $(foreach srclib, $(filter %.a %.lib,$(othersrc))\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(lib).ar-script "ADDLIB $(srclib)")
-        $(QUIET)$(APPEND) $(lib).ar-script "SAVE"
-        $(QUIET)$(APPEND) $(lib).ar-script "END"
-        $(QUIET)$(TOOL_MINGW32_AR) -M < $(lib).ar-script
+                ,$(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