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

This commit is contained in:
dbaron@dbaron.org 2007-08-19 17:00:11 -07:00
parent 291d724428
commit 5d73f51dfb
2 changed files with 8 additions and 2 deletions

View File

@ -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)

View File

@ -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=
DLL_SUFFIX=
# Setting MAKE_FRAMEWORK makes DLL_PREFIX and DLL_SUFFIX be ignored when
# 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 = \