mozilla-central: changeset 92530:c45e97eaba1867ca41f3995532341b4ab8f49dca

author	Christian Holler <choller@mozilla.com>
	Thu, 26 Apr 2012 10:42:07 -0700
changeset 92530	c45e97eaba1867ca41f3995532341b4ab8f49dca
parent 92529	852320142dceb7647896a64d8eab3068b1829e40
child 92531	a160766c3454ae737d838ff13ef0ec64682f34f6
push id	22544
push user	emorley@mozilla.com
push date	Fri, 27 Apr 2012 11:53:27 +0000
treeherder	mozilla-central@d871849ac3a3 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ted
bugs	741258
milestone	15.0a1
first release with	nightly linux32 b5c0d6abf69b / 15.0a1 / 20120428030503 / files nightly linux64 b5c0d6abf69b / 15.0a1 / 20120428030503 / files nightly mac b5c0d6abf69b / 15.0a1 / 20120428030503 / files nightly win32 b5c0d6abf69b / 15.0a1 / 20120428030503 / files nightly win64 b5c0d6abf69b / 15.0a1 / 20120428030503 / files
last release without	nightly linux32 75c7378c87b6 / 15.0a1 / 20120425030647 / files nightly linux64 75c7378c87b6 / 15.0a1 / 20120425030647 / files nightly mac 75c7378c87b6 / 15.0a1 / 20120425030647 / files nightly win32 75c7378c87b6 / 15.0a1 / 20120425030647 / files nightly win64 75c7378c87b6 / 15.0a1 / 20120425030647 / files

--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -278,16 +278,17 @@ ifeq ($(OS_TARGET),Linux)
 DEFAULT_GMAKE_FLAGS += FREEBL_LOWHASH=1
 endif
 
 ifdef MOZ_NO_WLZDEFS
 DEFAULT_GMAKE_FLAGS += ZDEFS_FLAG=
 endif
 ifdef MOZ_CFLAGS_NSS
 DEFAULT_GMAKE_FLAGS += XCFLAGS="$(CFLAGS)"
+DEFAULT_GMAKE_FLAGS += DARWIN_DYLIB_VERSIONS="-compatibility_version 1 -current_version 1 $(LDFLAGS)"
 endif
 
 SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_NSS_PATCH
 # If we're applying a patch, we'll copy the NSS source to the objdir