bug 1237863 - Silence linker errors from MOZ_FOLD_LIBS on Windows. r=glandium draft
authorTed Mielczarek <ted@mielczarek.org>
Fri, 15 Jan 2016 05:58:22 -0500
changeset 322004 5208dd7cda3a9aed971058361b0f18b0d7be94f6
parent 322003 304cdf4bbd8092608f732eb13597c6131b97359d
child 322006 1129bc4589b274227b2401043594c53bca2bf953
push id9505
push usertmielczarek@mozilla.com
push dateFri, 15 Jan 2016 15:04:57 +0000
reviewersglandium
bugs1237863
milestone46.0a1
bug 1237863 - Silence linker errors from MOZ_FOLD_LIBS on Windows. r=glandium
config/external/nss/Makefile.in
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -249,16 +249,20 @@ DEFAULT_GMAKE_FLAGS += MODULE_INCLUDES='
 
 # Work around NSS's MAKE_OBJDIR being racy. See bug #836220
 DEFAULT_GMAKE_FLAGS += MAKE_OBJDIR='$$(INSTALL) -D $$(OBJDIR)'
 
 # Work around NSS adding IMPORT_LIBRARY to TARGETS with no rule for
 # it, creating race conditions. See bug #836220
 DEFAULT_GMAKE_FLAGS += TARGETS='$$(LIBRARY) $$(SHARED_LIBRARY) $$(PROGRAM)'
 
+ifeq ($(MOZ_FOLD_LIBS),1)
+MOZ_FOLD_LIBS_FLAGS += -D_NSPR_BUILD_=1
+endif
+
 ifdef MOZ_FOLD_LIBS_FLAGS
 DEFAULT_GMAKE_FLAGS += XCFLAGS='$(MOZ_FOLD_LIBS_FLAGS)'
 endif
 
 ifndef WARNINGS_AS_ERRORS
 DEFAULT_GMAKE_FLAGS += NSS_ENABLE_WERROR=0
 endif
 ifeq ($(OS_TARGET),Android)