Changeset 231 for trunk/kBuild

Timestamp:

Feb 9, 2005, 2:55:35 PM (20 years ago)

Author:

bird

Message:

Map everywhere.

File:

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

trunk/kBuild/tools/GCC3.kmk

@@ -66 +66 @@
 TOOL_GCC3_LD_SONAME           = -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
 ifeq ($(BUILD_TARGET),os2)
-TOOL_GCC3_LD_MAP                          = -Zmap $(1)
-else
-TOOL_GCC3_LD_MAP                          = -Wl,-Map -Wl,$(1).map -Wl,--cref
+TOOL_GCC3_LD_MAP              = -Zmap $(1)
+else
+TOOL_GCC3_LD_MAP              = -Wl,-Map -Wl,$(1) -Wl,--cref
+endif
+ifeq ($(BUILD_TARGET),os2)
+TOOL_GCC3_LD_SYSMOD_MAP       = -Zmap $(1)
+else
+TOOL_GCC3_LD_SYSMOD_MAP       = -Map $(1) --cref
 endif
 ifdef SLKRUNS
@@ -195 +200 @@
                 $(foreach p,$(libpath), -L$(p)) \
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
-                $(call TOOL_GCC3_LD_MAP,$(outbase))
+                $(call TOOL_GCC3_LD_MAP,$(outbase).map)
 ifneq ($(custom_post),)
         $(eval $(custom_post))
 endif
+_OUT_FILES += $(outbase).map
 
 endef
@@ -229 +235 @@
                 $(foreach p,$(libpath), -L$(p)) \
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
-                $(call TOOL_GCC3_LD_MAP,$(outbase))
+                $(call TOOL_GCC3_LD_MAP,$(outbase).map)
 ifneq ($(custom_post),)
         $(eval $(custom_post))
 endif
+_OUT_FILES += $(outbase).map
 
 endef
@@ -259 +266 @@
         $(TOOL_GCC3_LD_SYSMOD) $(TOOL_GCC3_LDFLAGS.sysmod) $(flags) -o $$@ $(objs) \
                 $(foreach p,$(libpath), -L$(p)) \
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) 
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
+                $(call TOOL_GCC3_LD_SYSMOD_MAP,$(outbase).map)
 ifneq ($(custom_post),)
         $(eval $(custom_post))
 endif
-
-endef
-
+_OUT_FILES += $(outbase).map
+
+endef
+