Bug 762621 - Force loading NSPR before prldap60. r=Standard8
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 12 Jun 2012 13:50:12 +0200
changeset 10415 e0ce067587b74d460d8afb4887ccce8bf9851034
parent 10414 26ae99d43de4d83a0a07d7ada4964ee292b460f8
child 10416 64605d5789ccb8c481dfa631f1388098a527274d
push id7878
push userbugzilla@standard8.plus.com
push dateTue, 12 Jun 2012 13:10:07 +0000
treeherdercomm-central@64605d5789cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs762621
Bug 762621 - Force loading NSPR before prldap60. r=Standard8
mail/extradependlibs.mk
suite/extradependlibs.mk
--- a/mail/extradependlibs.mk
+++ b/mail/extradependlibs.mk
@@ -5,12 +5,15 @@
 # This file is included from mozilla/xpcom/stub/Makefile.in
 # Presume all mozilla/autoconf.mk is included and that it does not have
 # Direct access to c-c specific vars not present there.
 
 # We don't have access to MOZ_LDAP_XPCOM here, so cheat.
 ifneq (,$(findstring ldap,$(MOZ_APP_COMPONENT_LIBS)))
 DEPENDENT_LIBS_LIST += \
     $(DLL_PREFIX)ldap60$(DLL_SUFFIX) \
+    $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
+    $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
+    $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
     $(DLL_PREFIX)prldap60$(DLL_SUFFIX) \
     $(DLL_PREFIX)ldif60$(DLL_SUFFIX) \
     $(NULL)
 endif
--- a/suite/extradependlibs.mk
+++ b/suite/extradependlibs.mk
@@ -5,12 +5,15 @@
 # This file is included from mozilla/xpcom/stub/Makefile.in
 # Presume all mozilla/autoconf.mk is included and that it does not have
 # Direct access to c-c specific vars not present there.
 
 # We don't have access to MOZ_LDAP_XPCOM here, so cheat.
 ifneq (,$(findstring ldap,$(MOZ_APP_COMPONENT_LIBS)))
 DEPENDENT_LIBS_LIST += \
     $(DLL_PREFIX)ldap60$(DLL_SUFFIX) \
+    $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
+    $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
+    $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
     $(DLL_PREFIX)prldap60$(DLL_SUFFIX) \
     $(DLL_PREFIX)ldif60$(DLL_SUFFIX) \
     $(NULL)
 endif