summaryrefslogtreecommitdiff
path: root/nss.gyp
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2019-01-11 09:35:27 +1100
committerMartin Thomson <martin.thomson@gmail.com>2019-01-11 09:35:27 +1100
commitd5285e1ee5851217cde3c282065ad206287653ab (patch)
tree23cf6442c42536bcad4e99d6e3094507f9d8f2e2 /nss.gyp
parentb2467c62beddd663098e8fc5b0777b04e9996358 (diff)
downloadnss-hg-d5285e1ee5851217cde3c282065ad206287653ab.tar.gz
Bug 1519231 - Disable nsssysinit for Firefox builds, r=ted
Diffstat (limited to 'nss.gyp')
-rw-r--r--nss.gyp10
1 files changed, 9 insertions, 1 deletions
diff --git a/nss.gyp b/nss.gyp
index ba48c4bbf..3cc3d7b6d 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -29,6 +29,10 @@
[ 'OS=="linux"', {
'dependencies': [
'lib/freebl/freebl.gyp:freeblpriv3',
+ ],
+ }],
+ [ 'OS=="linux" and mozilla_client==0', {
+ 'dependencies': [
'lib/sysinit/sysinit.gyp:nsssysinit',
],
}],
@@ -68,7 +72,7 @@
'lib/util/util.gyp:nssutil',
],
'conditions': [
- [ 'OS=="linux"', {
+ [ 'OS=="linux" and mozilla_client==0', {
'dependencies': [
'lib/sysinit/sysinit.gyp:nsssysinit_static',
],
@@ -199,6 +203,10 @@
[ 'OS=="linux"', {
'dependencies': [
'cmd/lowhashtest/lowhashtest.gyp:lowhashtest',
+ ],
+ }],
+ [ 'OS=="linux" and mozilla_client==0', {
+ 'dependencies': [
'gtests/sysinit_gtest/sysinit_gtest.gyp:sysinit_gtest',
],
}],