Bug 587389 - dependentlibs.list not updated properly after bug 580407, r=khuey a=android build bustage
authorMichael Wu <mwu@mozilla.com>
Sat, 14 Aug 2010 21:58:07 -0700
changeset 50617 5f2c486bc90d986eb7bf011f9a97c9f47ee4fda8
parent 50616 bdbcceeb57f26bf6558f584b7c33fcf70b80e8d7
child 50618 f2af48b0cd7c22c0af016d33a34ae5dc6e3141ab
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey, android
bugs587389, 580407
milestone2.0b4pre
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 587389 - dependentlibs.list not updated properly after bug 580407, r=khuey a=android build bustage
xpcom/stub/Makefile.in
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -84,19 +84,22 @@ DEPENDENT_LIBS_LIST += \
 ifdef MOZ_ENABLE_LIBXUL
 
 DEPENDENT_LIBS_LIST += \
 	$(LIB_PREFIX)nssutil3$(DLL_SUFFIX) \
 	$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
 	$(LIB_PREFIX)nss3$(DLL_SUFFIX) \
 	$(LIB_PREFIX)ssl3$(DLL_SUFFIX) \
 	$(LIB_PREFIX)smime3$(DLL_SUFFIX) \
-	$(LIB_PREFIX)mozjs$(DLL_SUFFIX) \
 	$(NULL)
 
+ifdef JS_SHARED_LIBRARY
+DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozjs$(DLL_SUFFIX)
+endif
+
 ifndef MOZ_NATIVE_SQLITE
 ifeq ($(OS_TARGET),OS2)
 DEPENDENT_LIBS_LIST += mozsqlt3.dll
 else
 DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozsqlite3$(DLL_SUFFIX)
 endif
 endif