From a0a4432b0e8da38a35df27ef53c9d7ae51435bd2 Mon Sep 17 00:00:00 2001 From: Martin Thomson Date: Fri, 11 Jan 2019 09:35:27 +1100 Subject: [PATCH] Bug 1519231 - Disable nsssysinit for Firefox builds, r=ted --HG-- extra : rebase_source : d78c7bdf64a0190bca84e0ff956a81dc23b604a4 extra : amend_source : ff1801fd56925c7c0ccea701cd926be8cfe291c6 --- nss.gyp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nss.gyp b/nss.gyp index ba48c4bbfb..3cc3d7b6d7 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', ], }],