summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coreconf/config.gypi1
-rw-r--r--nss.gyp6
2 files changed, 6 insertions, 1 deletions
diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index 7bae38ae4..6900f7953 100644
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -137,6 +137,7 @@
'softfp_cflags%': '',
'enable_draft_hpke%': 0,
'force_integrated_as%': 0,
+ 'disable_ckbi%': 0,
},
'target_defaults': {
# Settings specific to targets should go here.
diff --git a/nss.gyp b/nss.gyp
index 5bbbcf152..2cf713af3 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -12,7 +12,6 @@
'target_name': 'nss_libs',
'type': 'none',
'dependencies': [
- 'lib/ckfw/builtins/builtins.gyp:nssckbi',
'lib/softoken/softoken.gyp:softokn3',
],
'conditions': [
@@ -50,6 +49,11 @@
'lib/softoken/legacydb/legacydb.gyp:nssdbm3',
],
}],
+ [ 'disable_ckbi==0', {
+ 'dependencies': [
+ 'lib/ckfw/builtins/builtins.gyp:nssckbi',
+ ],
+ }],
],
},
{