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

Timestamp:

May 12, 2008, 5:42:09 PM (17 years ago)

Author:

bird

Message:

Drop the .map files when using gcc, except of course, for OS/2.

File:

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

trunk/kBuild/tools/MINGW32.kmk

@@ -26 +26 @@
 #
 # As a special exception you are granted permission to include this file, via
-# the kmk include directive, as you wish without this in itself causing the 
-# resulting makefile, program or whatever to be covered by the GPL license. 
+# the kmk include directive, as you wish without this in itself causing the
+# resulting makefile, program or whatever to be covered by the GPL license.
 # This exception does not however invalidate any other reasons why the makefile,
 # program, whatever should not be covered the GPL.
@@ -85 +85 @@
 TOOL_MINGW32_LD  ?= $(TOOL_MINGW32_PREFIX)gcc$(TOOL_MINGW32_HOSTSUFF_EXE)
 endif
-TOOL_MINGW32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
-TOOL_MINGW32_LD_SYSMOD_MAP ?= -Map $(1) --cref
 TOOL_MINGW32_DLLWRAP ?= $(TOOL_MINGW32_PREFIX)dllwrap$(TOOL_MINGW32_HOSTSUFF_EXE)
 TOOL_MINGW32_DLLTOOL ?= $(TOOL_MINGW32_PREFIX)dlltool$(TOOL_MINGW32_HOSTSUFF_EXE)
@@ -236 +234 @@
         $(QUIET)$(TOOL_MINGW32_LD) $(flags) -o $(out) $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
-                $(call TOOL_MINGW32_LD_MAP,$(outbase).map)
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
 endef
 
@@ -256 +253 @@
 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).
+## @todo Find a better solution for installing the extra files (.a, .exp, .pdb, etc).
 TOOL_MINGW32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
         $(filter %.def %.res,$(othersrc))
@@ -269 +266 @@
                 $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
-                $(call TOOL_MINGW32_LD_MAP,$(outbase).map)
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
         $(QUIET)$(CP) $(outbase).exp $(outbase).a $(PATH_LIB)/
 endef
-## @todo seperate install stuff!
+## @todo separate install stuff!