Fix the way we build frameworks so it doesn't break dependencies of the form -ltracemalloc. b=392118 r=bsmedberg a=bzbarsky

config/rules.mk

@@ -149,7 +149,11 @@ ifdef LIB_IS_C_ONLY
 MKSHLIB			= $(MKCSHLIB)
 endif
 
+ifdef MAKE_FRAMEWORK
+SHARED_LIBRARY		:= $(LIBRARY_NAME)
+else
 SHARED_LIBRARY		:= $(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX)
+endif
 
 ifeq ($(OS_ARCH),OS2)
 DEF_FILE		:= $(SHARED_LIBRARY:.dll=.def)

toolkit/library/Makefile.in

@@ -57,8 +57,10 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 # This is going to be a framework named "XUL", not an ordinary library named
 # "libxul.dylib"
 LIBRARY_NAME=XUL
-DLL_PREFIX=
+# Setting MAKE_FRAMEWORK makes DLL_PREFIX and DLL_SUFFIX be ignored when
-DLL_SUFFIX=
+# setting SHARED_LIBRARY; we need to leave DLL_PREFIX and DLL_SUFFIX
+# as-is so that dependencies of the form -ltracemalloc still work.
+MAKE_FRAMEWORK=1
 endif
 
 REQUIRES = \