Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1018375 - part 3 - use a static list of NSS def files for MOZ_FOLD_LIBS groveling; r=glandium

Browse Source
This commit is contained in:
Nathan Froyd 2014-06-03 14:23:06 -04:00
parent 9d9500952d
commit f2878a277f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/build/Makefile.in
View File

@ -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