diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2020-02-14 10:05:56 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-02-14 15:25:24 +0100 |
| commit | 54acab919e7c7c5d60fc697bda54278861ac250e (patch) | |
| tree | 53302e538f90f8a4791421cf5c8946a2d9422de0 | |
| parent | 1d8e99ba5e74ef5f9f7adb9ba941550dc9336724 (diff) | |
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-x | bin/symstore.sh | 16 | ||||
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 4 |
2 files changed, 19 insertions, 1 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 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)" \ |