autoland: changeset 47853:6768c40a2c55f946ff4753c25c9415c46e696cf5

author	James Cook <bringbackbsd@hotmail.com>
	Sat, 17 Jul 2010 09:52:30 +0300
changeset 47853	6768c40a2c55f946ff4753c25c9415c46e696cf5
parent 47852	bcc82f4858c56849693c76e746b5a422d3696add
child 47854	460e93847f2d862a75b6a03241f441bc7ee69035
push id	14448
push user	romaxa@gmail.com
push date	Sat, 17 Jul 2010 07:27:17 +0000
treeherder	autoland@460e93847f2d [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	doug.turner
bugs	574311
milestone	2.0b2pre
first release with	nightly linux32 b00bb3a115de / 4.0b2pre / 20100717030004 / files nightly linux64 b00bb3a115de / 4.0b2pre / 20100717030824 / files nightly mac b00bb3a115de / 4.0b2pre / 20100717030745 / files nightly win32 b00bb3a115de / 4.0b2pre / 20100717054110 / files nightly win64 f6ea1d942fe2 / 4.0b2pre / 20100717063401 / files
last release without	nightly linux32 96de199027d7 / 4.0b2pre / 20100716025911 / files nightly linux64 96de199027d7 / 4.0b2pre / 20100716030639 / files nightly mac 96de199027d7 / 4.0b2pre / 20100716030728 / files nightly win32 96de199027d7 / 4.0b2pre / 20100716040830 / files nightly win64 9712aa5f77e1 / 4.0b2pre / 20100716150536 / files

--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@@ -81,18 +81,18 @@ ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXTRA_DSO_LIBS	= xul
 endif
 endif
 
 LIBS		+= \
 		$(LIBS_DIR) \
 		tmreader.$(OBJ_SUFFIX) \
 		adreader.$(OBJ_SUFFIX) \
+		$(XPCOM_GLUE_LDOPTS) \
 		$(EXTRA_DSO_LIBS) \
-		$(XPCOM_GLUE_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 ifdef MOZ_ENABLE_LIBXUL
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LIBS += $(DIST)/bin/XUL
 endif
 endif