Bug 394329 - Ship the JS import library in the SDK, and stop linking it from browsercomps which doesn't use it, r=luser a=NPDB
authorbenjamin@smedbergs.us
Wed, 05 Sep 2007 08:56:56 -0700
changeset 5701 e26c0b65343448bc64d17711ef8690c0e3347c2e
parent 5700 0da88ab5737d41b06f8a0ed88146826efd849da8
child 5702 03da5f42e53f4c1256b1774a2cf0b6d7f1c32d81
push idunknown
push userunknown
push dateunknown
reviewersluser, NPDB
bugs394329
milestone1.9a8pre
Bug 394329 - Ship the JS import library in the SDK, and stop linking it from browsercomps which doesn't use it, r=luser a=NPDB
browser/components/build/Makefile.in
js/src/Makefile.in
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -74,17 +74,16 @@ ifdef MOZ_SAFE_BROWSING
 REQUIRES += safebrowsing
 LOCAL_INCLUDES += -I$(srcdir)/../safebrowsing/src
 SHARED_LIBRARY_LIBS += ../safebrowsing/src/$(LIB_PREFIX)safebrowsing_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_DSO_LDOPTS += \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(LIBXUL_DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
-	$(MOZ_JS_LIBS) \
 	$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
 # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
 # GTK2: Need to link with glib for GNOME shell service
 ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += \
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -155,16 +155,22 @@ EXPORTS		= \
 ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 EXPORTS		+= jscpucfg.h
 endif
 
 JS_SAFE_ARENA	= 1
 
 DASH_R		= -r
 
+ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+SDK_LIBRARY = $(IMPORT_LIBRARY)
+else
+SDK_LIBRARY = $(SHARED_LIBRARY)
+endif
+
 include $(topsrcdir)/config/config.mk
 
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
 # When using gcc the assembly is inlined in the C-file (see jslock.c)
 ifeq ($(OS_ARCH),SunOS)
 ifneq (86,$(findstring 86,$(OS_TEST)))
 ifndef GNU_CC