Update build system to match new NSS configurations
authorEKR <ekr@rtfm.com>
Sat, 06 Feb 2016 07:58:12 -0800
changeset 690492 74d15ce935129fad84c4803a0d8b7237e3acbc04
parent 690491 c782907972c78ea88f9fe3dc43b63aa09066cd2d
child 690493 ca7c3a3a1bbd81b4bec9beb96de29b738bbe6e11
push id108442
push userekr@mozilla.com
push dateSat, 06 Feb 2016 15:58:40 +0000
treeherdertry@ca7c3a3a1bbd [default view] [failures only]
milestone47.0a1
Update build system to match new NSS configurations
config/external/nss/Makefile.in
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -170,17 +170,17 @@ DEFAULT_GMAKE_FLAGS += NSDISTMODE=absolu
 endif
 ifdef MACOS_SDK_DIR
 DEFAULT_GMAKE_FLAGS += MACOS_SDK_DIR=$(MACOS_SDK_DIR)
 endif
 endif
 
 # Turn off TLS compression support because it requires system zlib.
 # See bug 580679 comment 18.
-DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ZLIB=
+DEFAULT_GMAKE_FLAGS += NSS_ENABLE_SSL_ZLIB=
 
 # Disable building of the test programs in security/nss/lib/zlib
 DEFAULT_GMAKE_FLAGS += PROGRAMS=
 
 # Disable creating .chk files. They will be generated from packager.mk
 # When bug 681624 lands, we can replace CHECKLOC= with SKIP_SHLIBSIGN=1
 DEFAULT_GMAKE_FLAGS += CHECKLOC=