diff options
Diffstat (limited to 'nss/lib/ssl/config.mk')
| -rw-r--r-- | nss/lib/ssl/config.mk | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/nss/lib/ssl/config.mk b/nss/lib/ssl/config.mk index 40b1c30..339cc80 100644 --- a/nss/lib/ssl/config.mk +++ b/nss/lib/ssl/config.mk @@ -7,21 +7,6 @@ ifdef NISCC_TEST DEFINES += -DNISCC_TEST endif -# Allow build-time configuration of TLS 1.3 (Experimental) -ifdef NSS_ENABLE_TLS_1_3 -DEFINES += -DNSS_ENABLE_TLS_1_3 -endif - -ifdef NSS_NO_PKCS11_BYPASS -DEFINES += -DNO_PKCS11_BYPASS -else -CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) - -EXTRA_LIBS += \ - $(CRYPTOLIB) \ - $(NULL) -endif - ifeq (,$(filter-out WIN%,$(OS_TARGET))) # don't want the 32 in the shared library name @@ -72,22 +57,15 @@ endif endif -# Mozilla's mozilla/modules/zlib/src/zconf.h adds the MOZ_Z_ prefix to zlib -# exported symbols, which causes problem when NSS is built as part of Mozilla. -# So we add a NSS_ENABLE_ZLIB variable to allow Mozilla to turn this off. -NSS_ENABLE_ZLIB = 1 -ifdef NSS_ENABLE_ZLIB - -DEFINES += -DNSS_ENABLE_ZLIB +ifdef NSS_SSL_ENABLE_ZLIB +DEFINES += -DNSS_SSL_ENABLE_ZLIB +include $(CORE_DEPTH)/coreconf/zlib.mk +endif -# If a platform has a system zlib, set USE_SYSTEM_ZLIB to 1 and -# ZLIB_LIBS to the linker command-line arguments for the system zlib -# (for example, -lz) in the platform's config file in coreconf. -ifdef USE_SYSTEM_ZLIB -OS_LIBS += $(ZLIB_LIBS) -else -ZLIB_LIBS = $(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) -EXTRA_LIBS += $(ZLIB_LIBS) +ifndef NSS_ENABLE_TLS_1_3 +NSS_DISABLE_TLS_1_3=1 endif +ifdef NSS_DISABLE_TLS_1_3 +DEFINES += -DNSS_DISABLE_TLS_1_3 endif |