From f2878a277f03869b473e815078cb43a6dbe535a0 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 3 Jun 2014 14:23:06 -0400 Subject: [PATCH] Bug 1018375 - part 3 - use a static list of NSS def files for MOZ_FOLD_LIBS groveling; r=glandium --- security/build/Makefile.in | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/security/build/Makefile.in b/security/build/Makefile.in index 3109cfa5636d..4be03a8c991f 100644 --- a/security/build/Makefile.in +++ b/security/build/Makefile.in @@ -333,12 +333,22 @@ EXTRA_DSO_LDOPTS += $(DEPTH)/db/sqlite3/src/$(LIB_PREFIX)mozsqlite3.$(LIB_SUFFIX # Add all static libraries for nss, smime, ssl and nssutil SHARED_LIBRARY_LIBS = $(addprefix ../,$(NSS_STATIC_LIBS)) +nss_def_files := $(addprefix $(srcdir)/../, \ + nss/lib/util/nssutil.def \ + nss/lib/nss/nss.def \ + nss/lib/ssl/ssl.def \ + nss/lib/smime/smime.def \ +) + +# Try to guard against NSS renaming things out from underneath us. +ifneq ($(nss_def_files),$(wildcard $(nss_def_files))) +$(error Need to update list of NSS def files) +endif + ifeq (WINNT,$(OS_TARGET)) # Create a .def file based on the various .def files for nss, smime, ssl and # nssutil. -NSS_STATIC_LIBS_DEFS := $(wildcard $(addprefix $(srcdir)/../,$(NSS_STATIC_LIBS:.$(LIB_SUFFIX)=.def))) - -nss3.def: $(NSS_STATIC_LIBS_DEFS) $(DEPTH)/db/sqlite3/src/sqlite-processed.def +nss3.def: $(nss_def_files) $(DEPTH)/db/sqlite3/src/sqlite-processed.def echo LIBRARY nss3$(DLL_SUFFIX) > $@.tmp echo EXPORTS >> $@.tmp grep -v -h -e ^LIBRARY -e ^EXPORTS -e ^\; $^ >> $@.tmp