[Libreoffice-commits] core.git: bin/symstore.sh external/nss

[Juergen Funk (via logerrit)]

 bin/symstore.sh                     |   16 +++++++++++++++-
 external/nss/ExternalProject_nss.mk |    4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 54acab919e7c7c5d60fc697bda54278861ac250e
Author:     Juergen Funk <juergen.funk_ml at cib.de>
AuthorDate: Fri Feb 14 10:05:56 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Feb 14 15:25:24 2020 +0100

    Optionally generate PDBs also for nss
    
    Enables pdb generation for symbol builds, for:
    - freebl3.dll
    - libeay32.dll
    - nspr4.dll
    - nss3.dll
    - nssckbi.dll
    - nssdbm3.dll
    - nssutil3.dll
    - plc4.dll
    - plds4.dll
    - smime3.dll
    - softokn3.dll
    - sqlite3.dll
    - ssl3.dll
    - ssleay32.dll
    
    Change-Id: I231fdc8e8ade7b7a8b85fc76536291e0546f2eac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88673
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/bin/symstore.sh b/bin/symstore.sh
index 9809c5554c8a..b1470ae9b947 100755
--- a/bin/symstore.sh
+++ b/bin/symstore.sh
@@ -15,7 +15,21 @@ BLACK_LIST="python.exe"
 # an error, if duplicates are found.
 #
 # Same format as for BLACK_LIST above
-MOREPDBS_OKLIST="libcurl.dll"
+MOREPDBS_OKLIST="libcurl.dll
+freebl3.dll
+libeay32.dll
+nspr4.dll
+nss3.dll
+nssckbi.dll
+nssdbm3.dll
+nssutil3.dll
+plc4.dll
+plds4.dll
+smime3.dll
+softokn3.dll
+sqlite3.dll
+ssl3.dll
+ssleay32.dll"
 
 
 add_pdb()
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 4d175e184da5..57b0c961c611 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -19,6 +19,10 @@ ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_ExternalProject_run,build,\
 		$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
+		$(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \
+			MOZ_DEBUG_SYMBOLS=1 \
+			MOZ_DEBUG_FLAGS=" " \
+			OPT_CODE_SIZE=0) \
 		MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
 		$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
 		LIB="$(ILIB)" \