Fix bustage for non-libxul apps following bug 566467 - link xpcom-core against psapi.lib
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 21 May 2010 09:21:52 +0100
changeset 42528 1fdaa078649f34bc01017ea8544a0fcb1049d141
parent 42527 730321f9d53edc0c9b31edf4eba8cd135bacce76
child 42529 7066468619b59e88669c00966e205081437faa00
push id13385
push userbugzilla@standard8.plus.com
push dateFri, 21 May 2010 08:22:17 +0000
treeherdermozilla-central@1fdaa078649f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs566467
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Fix bustage for non-libxul apps following bug 566467 - link xpcom-core against psapi.lib
xpcom/build/Makefile.in
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -183,16 +183,19 @@ ifdef HAVE_CLOCK_MONOTONIC
 EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version)
 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
 OS_LIBS += $(call EXPAND_LIBNAME,imagehlp)
 endif
+ifndef MOZ_ENABLE_LIBXUL
+OS_LIBS += $(call EXPAND_LIBNAME,psapi)
+endif
 endif # WINNT
 
 ifeq ($(OS_ARCH),WINCE)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 aygshell)
 endif # WINCE
 
 export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(XPCOM_GLUENS_SRC_CPPSRCS)
 	$(INSTALL) $^ .