mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
c6cd560138
bug-835919.patch and bug-835919.patch. r=wtc. Bug 866525: Add AddressSanitizer annotations to port_ArenaZeroAfterMark. r=choller. Also include fixes for bug 866363, bug 866949, bug 835919, bug 863871.
27 lines
684 B
Diff
27 lines
684 B
Diff
diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile
|
|
--- a/cmd/shlibsign/Makefile
|
|
+++ b/cmd/shlibsign/Makefile
|
|
@@ -40,19 +40,19 @@ EXTRA_SHARED_LIBS += \
|
|
-lplds4 \
|
|
-lnspr4 \
|
|
$(NULL)
|
|
|
|
endif
|
|
|
|
|
|
# sign any and all shared libraries that contain the word freebl
|
|
-ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1))
|
|
-CHECKLIBS=
|
|
-CHECKLOC=
|
|
+ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
|
|
+CHECKLIBS =
|
|
+CHECKLOC =
|
|
else
|
|
CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX)
|
|
CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX))
|
|
ifndef NSS_DISABLE_DBM
|
|
CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
|
|
endif
|
|
CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
|
|
|