bug 1319405 - fix --with-system-nss build. r=mshal
authorTed Mielczarek <ted@mielczarek.org>
Tue, 22 Nov 2016 09:45:37 -0500
changeset 324194 10a01f31d4325b74361405ac9e1009d2353e5f07
parent 324193 03434938bd29029add97fa4850ccef4086299326
child 324195 37a877e840fc012433e1aaba208a1c13f9ce22f1
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersmshal
bugs1319405
milestone53.0a1
bug 1319405 - fix --with-system-nss build. r=mshal MozReview-Commit-ID: EoZWWVnofYG
security/manager/ssl/moz.build
--- a/security/manager/ssl/moz.build
+++ b/security/manager/ssl/moz.build
@@ -179,16 +179,17 @@ if CONFIG['NSS_DISABLE_DBM']:
 
 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True'
 DEFINES['NSS_ENABLE_ECC'] = 'True'
 for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
 DEFINES['CERT_AddTempCertToPerm'] = '__CERT_AddTempCertToPerm'
 
-USE_LIBS += [
-    'crmf',
-]
+if not CONFIG['MOZ_SYSTEM_NSS']:
+    USE_LIBS += [
+        'crmf',
+    ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']