Bug 709562 - Part 1. Add delay load for RAS dlls. r=khuey
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 03 Jan 2012 19:08:33 +0900
changeset 84906 6c8e6f6a8ac8a374504a8b3f82ccda25f2ab64c3
parent 84905 6ed882263c14a860b8cd8616e6dbada7f8aaf372
child 84907 cb346e8b07897fc24f75723cfbb3385c4757e5a4
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs709562
milestone12.0a1
Bug 709562 - Part 1. Add delay load for RAS dlls. r=khuey
toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -550,16 +550,23 @@ endif
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg)
 ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
 OS_LIBS += $(call EXPAND_LIBNAME,imagehlp)
 endif
 ifdef MOZ_CRASHREPORTER
 OS_LIBS += $(call EXPAND_LIBNAME,wininet)
 endif
+ifdef _MSC_VER
+OS_LIBS += $(call EXPAND_LIBNAME,delayimp)
+EXTRA_DSO_LDOPTS += \
+  -DELAYLOAD:rasapi32.dll \
+  -DELAYLOAD:rasdlg.dll \
+  $(NULL)
+endif
 endif # WINNT
 
 ifdef MOZ_JPROF
 EXTRA_DSO_LDOPTS += -ljprof
 endif
 
 ifdef MOZ_ENABLE_QT
 EXTRA_DSO_LDOPTS += $(MOZ_QT_LDFLAGS) $(XEXT_LIBS)