From ffacce10727f2ab174055fa28a2aad0dabf5c0ef Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Fri, 21 May 2010 07:21:00 -0400 Subject: [PATCH] Bug 566467 - fixed compilation with --disable-ipc. [r=ted] (transplanted from 4153cd536a731cf51eb7b40693213b79b0fbe5ec) --HG-- extra : transplant_source : AS%CDSjs%1C%F5%1E%B7%B4%06%93%21%3By%B0%FB%E5%EC --- toolkit/library/Makefile.in | 2 +- toolkit/library/libxul-config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 1a1f9d0345bd..b06f4fd14bb3 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -236,7 +236,7 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle endif ifeq ($(OS_ARCH),WINNT) -OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi) +OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi) ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) OS_LIBS += $(call EXPAND_LIBNAME,imagehlp) endif diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk index 5599c92d74aa..db59f989f953 100644 --- a/toolkit/library/libxul-config.mk +++ b/toolkit/library/libxul-config.mk @@ -107,7 +107,7 @@ ifeq (Linux,$(OS_ARCH)) OS_LIBS += -lrt endif ifeq (WINNT,$(OS_ARCH)) -OS_LIBS += psapi.lib dbghelp.lib +OS_LIBS += dbghelp.lib endif endif