Bug 1530671 - Title: Enable the NSS gyp build to distinguish a Mozilla build from a Comm build r=glandium
authorKai Engert <kaie@kuix.de>
Wed, 13 Mar 2019 22:32:46 +0000
changeset 521827 082a7bbf945a
parent 521826 88ea72c345ab
child 521828 30dfd6603f79
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1530671
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1530671 - Title: Enable the NSS gyp build to distinguish a Mozilla build from a Comm build r=glandium Differential Revision: https://phabricator.services.mozilla.com/D21525
security/moz.build
--- a/security/moz.build
+++ b/security/moz.build
@@ -60,16 +60,21 @@ elif not CONFIG['MOZ_SYSTEM_NSS']:
     gyp_vars['nspr_libs'] = 'nspr'
 else:
     # Build mozpkix and mozpkix-test only
     gyp_vars['nspr_libs'] = 'nspr'
     gyp_vars['mozpkix_only'] = 1
 
 # This disables building some NSS tools.
 gyp_vars['mozilla_client'] = 1
+
+# This builds NSS tools in COMM applications that Firefox doesn't build.
+if CONFIG['MOZ_BUILD_APP'].startswith('comm/'):
+    gyp_vars['comm_client'] = 1
+
 # We run shlibsign as part of packaging, not build.
 gyp_vars['sign_libs'] = 0
 gyp_vars['python'] = CONFIG['PYTHON']
 # The NSS gyp files do not have a default for this.
 gyp_vars['nss_dist_dir'] = '$PRODUCT_DIR/dist'
 # NSS wants to put public headers in $nss_dist_dir/public/nss by default,
 # which would wind up being mapped to dist/include/public/nss (by
 # gyp_reader's `handle_copies`).