Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 544191: Use system zlib on Mac OS X. When using system zlib, -lz has

Browse Source 
to be added to OS_LIBS instead of EXTRA_LIBS because $(PROGRAM) depends on
$(EXTRA_LIBS).  r=rrelyea.
Modified Files:
	coreconf/Darwin.mk nss/cmd/platlibs.mk
	nss/cmd/modutil/Makefile nss/cmd/signtool/Makefile


git-svn-id: svn://10.0.0.236/trunk@259601 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com
2010-02-04 18:59:11 +00:00
parent a7471de73f
commit bd2878fda4
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/security/coreconf/Darwin.mk
View File

@@ -131,4 +131,5 @@ DLL_SUFFIX = dylib
PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
G++INCLUDES = -I/usr/include/g++
USE_SYSTEM_ZLIB = 1
ZLIB_LIBS = -lz

6
mozilla/security/nss/cmd/modutil/Makefile
View File

@@ -57,6 +57,12 @@ include $(CORE_DEPTH)/coreconf/config.mk
#######################################################################
include ../platlibs.mk
ifdef USE_SYSTEM_ZLIB
OS_LIBS += $(ZLIB_LIBS)
else
EXTRA_LIBS += $(ZLIB_LIBS)
endif
#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
#######################################################################

4
mozilla/security/nss/cmd/platlibs.mk
View File

@@ -250,6 +250,4 @@ ifndef USE_SYSTEM_ZLIB
ZLIB_LIBS = $(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX)
endif
JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
$(ZLIB_LIBS) \
$(NULL)
JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX)

6
mozilla/security/nss/cmd/signtool/Makefile
View File

@@ -58,6 +58,12 @@ include $(CORE_DEPTH)/coreconf/config.mk
include ../platlibs.mk
ifdef USE_SYSTEM_ZLIB
OS_LIBS += $(ZLIB_LIBS)
else
EXTRA_LIBS += $(ZLIB_LIBS)
endif
#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
#######################################################################