Make trace-malloc work again on Linux following mozalloc landing. (Bug 576776) r=cjones
authorL. David Baron <dbaron@dbaron.org>
Fri, 16 Jul 2010 22:36:34 -0700
changeset 47848 46af914448aefb49b77f6bba7786b6ba3eea0e2c
parent 47847 70967e44b56c46a4156b6d957a05dc8e8d9ee72a
child 47849 53a5c3bb6c5c1f7f765982d8c8826b3a6ac81bc7
push id14446
push userdbaron@mozilla.com
push dateSat, 17 Jul 2010 05:37:31 +0000
treeherderautoland@53a5c3bb6c5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs576776
milestone2.0b2pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Make trace-malloc work again on Linux following mozalloc landing. (Bug 576776) r=cjones
tools/trace-malloc/lib/Makefile.in
--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -65,14 +65,16 @@ EXPORTS         = nsTraceMalloc.h
 
 EXTRA_DSO_LDOPTS = $(NSPR_LIBS) $(XPCOM_LIBS)
 
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS		+= nsDebugHelpWin32.cpp nsWinTraceMalloc.cpp
 OS_LIBS		+= shell32.lib ole32.lib uuid.lib imagehlp.lib
 endif
 
+DEFINES		+= -DMOZ_NO_MOZALLOC
+
 ifdef WRAP_SYSTEM_INCLUDES
 DEFINES		+= -DWRAP_SYSTEM_INCLUDES
 endif
 
 include $(topsrcdir)/config/rules.mk