external/nss/ExternalProject_nss.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 28fbe2a32b08cdd77769de4fc244b0bbb6e7fbd3
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Apr 25 17:11:54 2024 +0100
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu Apr 25 21:26:05 2024 +0200
add debuginfo generation flags to internal nss
Change-Id: I34c9df0f94121013dada738ecd2b6bf91d138024
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166641
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index b603061ca9a0..79e7f8eb2b2e 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -74,7 +74,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
RANLIB="$(RANLIB)" \
NMEDIT="$(NM)edit" \
COMMA=$(COMMA) \
- CC="$(CC) $(if $(filter
-fsanitize=undefined,$(CC)),-fno-sanitize=function) $(if $(filter iOS,$(OS)),
-DNSS_STATIC_SOFTOKEN=1 -DNSS_STATIC_FREEBL=1 -DNSS_STATIC_PKCS11=1)$(if
$(filter ANDROID,$(OS)), -D_PR_NO_LARGE_FILES=1 -DSQLITE_DISABLE_LFS=1)"
CCC="$(CXX)" \
+ CC="$(CC) $(gb_DEBUGINFO_FLAGS) \
+ $(if $(filter
-fsanitize=undefined,$(CC)),-fno-sanitize=function) \
+ $(if $(filter iOS,$(OS)),
-DNSS_STATIC_SOFTOKEN=1 -DNSS_STATIC_FREEBL=1 -DNSS_STATIC_PKCS11=1) \
+ $(if $(filter ANDROID,$(OS)),
-D_PR_NO_LARGE_FILES=1 -DSQLITE_DISABLE_LFS=1)" \
+ CCC="$(CXX) $(gb_DEBUGINFO_FLAGS)" \
$(if $(CROSS_COMPILING),NSINSTALL="$(if $(filter
MACOSX,$(OS_FOR_BUILD)),xcrun python3,$(call
gb_ExternalExecutable_get_command,python))
$(SRCDIR)/external/nss/nsinstall.py") \
$(if $(filter ANDROID,$(OS)),OS_TARGET=Android
OS_TARGET_RELEASE=$(ANDROID_API_LEVEL) ARCHFLAG="" DEFAULT_COMPILER=clang
ANDROID_NDK=$(ANDROID_NDK_DIR)
ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION)
ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(ANDROID_NDK_DIR)/sysroot) \
NSS_DISABLE_GTESTS=1 \
