Attempt to make trace-malloc build correctly with libxul (as a part of it).

toolkit/library/Makefile.in

@@ -166,9 +166,12 @@ GARBAGE += \
 endif
 else
 ifdef NS_TRACE_MALLOC
+# In libxul builds, tracemalloc is part of libxul instead.
+ifndef MOZ_ENABLE_LIBXUL
 EXTRA_DSO_LIBS += tracemalloc
 endif
 endif
+endif
 
 ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)

toolkit/library/libxul-config.mk

@@ -339,5 +339,5 @@ EXTRA_DSO_LIBS += boehm
 endif
 
 ifdef NS_TRACE_MALLOC
-EXTRA_DSO_LIBS += tracemalloc
+STATIC_LIBS += tracemalloc
 endif