bug 1237863 - Silence linker errors from MOZ_FOLD_LIBS on Windows. r?glandium draft
authorTed Mielczarek <ted@mielczarek.org>
Tue, 15 Dec 2015 11:13:55 -0500
changeset 319874 efb15d7eb2ed610cff526537402af07718e6b572
parent 319873 b8f0a0bd513320197c1f95f262fa95e3d3b7cd29
child 319875 d5970ce1601e0037d0d364468042fb030f4cfcf9
push id9111
push usertmielczarek@mozilla.com
push dateFri, 08 Jan 2016 02:10:58 +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 ($(OS_TARGET)_$(MOZ_FOLD_LIBS),WINNT_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)