summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Funk <juergen.funk_ml@cib.de>2020-02-14 10:05:56 +0100
committerThorsten Behrens <thorsten.behrens@allotropia.de>2021-11-23 00:14:17 +0100
commitc10f7d27524cd45966d2bfbfafe9919c0e941113 (patch)
treeecf15d03b0b979b7cc1bb8e6ad9d4b4569632d74
parentFix typos (diff)
downloadcore-c10f7d27524cd45966d2bfbfafe9919c0e941113.tar.gz
core-c10f7d27524cd45966d2bfbfafe9919c0e941113.zip
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@CIB.de>
-rwxr-xr-xbin/symstore.sh16
-rw-r--r--external/nss/ExternalProject_nss.mk6
2 files changed, 20 insertions, 2 deletions
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 722da93fa51f..7f730cb2bc87 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -19,7 +19,11 @@ 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) \
- OS_TARGET=WIN95 \
+ $(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)" \
XCFLAGS="-arch:SSE $(SOLARINC)" \