Bug 738790: Add mozglue to dependentlibs.list to fix xulrunner stub loading. r=glandium
authorDave Townsend <dtownsend@oxymoronical.com>
Fri, 06 Apr 2012 08:26:38 -0700
changeset 94500 39fc4711349c5b598cbcf013c251b7d515b6fb4a
parent 94499 db25cbcdef4c2fffa5c944e21a9852898b9b3707
child 94501 11b6ea48df175e1217cb358f43077417f71e3c17
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs738790
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 738790: Add mozglue to dependentlibs.list to fix xulrunner stub loading. r=glandium
xpcom/stub/Makefile.in
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -67,18 +67,23 @@ else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
 
 FORCE_SHARED_LIB = 1
 
 EXTRA_DSO_LDOPTS = $(LIBS_DIR)
 
-# Must be included before DEPENDENT_LIBS_LIST starts so that apps have a chance
-# of getting their stuff in before xul.
+# Must be included before any libraries that might depend on it
+ifdef MOZ_GLUE_LDFLAGS
+DEPENDENT_LIBS_LIST += $(DLL_PREFIX)mozglue$(DLL_SUFFIX)
+endif
+
+# Must be included before the rest of the libraries in DEPENDENT_LIBS_LIST
+# so that apps have a chance of getting their stuff in before xul.
 # It is ok for this file not to exist
 -include $(topsrcdir)/$(MOZ_BUILD_APP)/extradependlibs.mk
 
 DEPENDENT_LIBS_LIST += \
 	$(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
 	$(DLL_PREFIX)plc4$(DLL_SUFFIX) \
 	$(DLL_PREFIX)plds4$(DLL_SUFFIX) \
 	$(DLL_PREFIX)mozalloc$(DLL_SUFFIX) \