part of bug 170618

Better enable MOZ_MAPINFO for windows builds.
This will lead to some tools to read the map files and report on code/data size.

Makefile.in

@@ -219,6 +219,12 @@ ifdef NS_TRACE_MALLOC
 tier_9_dirs	+= tools/trace-malloc
 endif
 
+ifdef MOZ_MAPINFO
+ifeq ($(OS_ARCH),WINNT)
+tier_9_dirs	+= tools/codesighs
+endif
+endif
+
 tier_9_dirs	+= l10n
 
 ifdef MOZ_PHOENIX

config/config.mk

@@ -311,13 +311,6 @@ OS_LDFLAGS = /DEBUG /DEBUGTYPE:CV /PDB:NONE /OPT:REF /OPT:nowin98
 endif
 # NS_TRACE_MALLOC
 
-# if MOZ_DEBUG is not set and MOZ_MAPINFO
-ifdef MOZ_MAPINFO
-MAPFILE=$(LIBRARY_NAME).map
-OS_LDFLAGS += /MAP:$(MAPFILE) /MAPINFO:LINES
-endif
-#MOZ_MAPINFO
-
 endif # MOZ_DEBUG
 endif # WINNT
 

config/rules.mk

@@ -207,11 +207,18 @@ endif
 else
 PDBFILE=$(basename $(@F)).pdb
 ifdef MOZ_DEBUG
-MAPFILE=$(basename $(@F)).map
 CODFILE=$(basename $(@F)).cod
 endif
 endif
 
+ifdef MOZ_MAPINFO
+ifdef LIBRARY_NAME
+MAPFILE=$(LIBRARY_NAME).map
+else
+MAPFILE=$(basename $(@F)).map
+endif # LIBRARY_NAME
+endif # MOZ_MAPINFO
+
 ifdef DEFFILE
 CFLAGS += /DEF:$(DEFFILE)
 CXXFLAGS += /DEF:$(DEFFILE)
@@ -219,7 +226,7 @@ DSO_LDOPTS += /DEF:$(DEFFILE)
 endif
 
 ifdef MAPFILE
-DSO_LDOPTS += /MAP:$(MAPFILE) /MAPINFO:LINES
+OS_LDFLAGS += /MAP:$(MAPFILE) /MAPINFO:LINES
 #CFLAGS += -Fm$(MAPFILE)
 #CXXFLAGS += -Fm$(MAPFILE)
 endif