bug 1237863 - Silence linker errors from MOZ_FOLD_LIBS on Windows. r=glandium
authorTed Mielczarek <ted@mielczarek.org>
Fri, 15 Jan 2016 05:58:22 -0500
changeset 281493 a97ef6f6f50acd9fa82d19e4f0d3f5e44c9de757
parent 281492 e506ae694a2216452514ad8327989f12e687b63b
child 281494 fe759d940e9f68c7476f5ac384e563b7263f9207
push id70819
push usertmielczarek@mozilla.com
push dateMon, 25 Jan 2016 16:37:58 +0000
treeherdermozilla-inbound@99bdd3287bcf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1237863
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
@@ -252,16 +252,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)