Bug 397227 - Second attempt at fixing bustage on Linux leak test tinderbox, r=redness
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -192,21 +192,17 @@ endif # XPCSHELL_TESTS
ifdef CPP_UNIT_TESTS
# Compile the tests to $(DIST)/bin. Make lots of niceties available by default
# through TestHarness.h, by modifying the list of includes and the libs against
# which stuff links.
CPPSRCS += $(CPP_UNIT_TESTS)
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
REQUIRES += testing xpcom
-ifndef MOZ_ENABLE_LIBXUL
-LIBS += $(XPCOM_LIBS) $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
-else
-LIBS += $(XPCOM_LIBS) $(XPCOM_STANDALONE_GLUE_LDOPTS) $(NSPR_LIBS)
-endif
+LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
# ...and run them the usual way
check::
@$(EXIT_ON_ERROR) \
for f in $(subst .cpp,,$(CPP_UNIT_TESTS)); do \
XPCOM_DEBUG_BREAK=stack-and-abort $(RUN_TEST_PROGRAM) $(DIST)/bin/$$f; \
done