diff options
author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-06-09 19:22:05 +0200 |
---|---|---|
committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-06-09 19:22:05 +0200 |
commit | 19adc7041d8910d42c5a05193977961491955f2a (patch) | |
tree | 7879c5f46f9ded6dc4a8f952da69e54442ced2d8 /nss.gyp | |
parent | 6962ead3f7a2fbfc7cc616a2bc72176455eb2481 (diff) | |
download | nss-hg-19adc7041d8910d42c5a05193977961491955f2a.tar.gz |
Bug 1372515 - allow enabling libpkix in gyp builds, r=ttaubert
Differential Revision: https://nss-review.dev.mozaws.net/D350
Diffstat (limited to 'nss.gyp')
-rw-r--r-- | nss.gyp | 18 |
1 files changed, 2 insertions, 16 deletions
@@ -59,7 +59,8 @@ 'lib/smime/smime.gyp:smime', 'lib/softoken/softoken.gyp:softokn', 'lib/ssl/ssl.gyp:ssl', - 'lib/util/util.gyp:nssutil' + 'lib/util/util.gyp:nssutil', + 'lib/libpkix/libpkix.gyp:libpkix', ], 'conditions': [ [ 'OS=="linux"', { @@ -73,21 +74,6 @@ 'lib/softoken/legacydb/legacydb.gyp:nssdbm', ], }], - [ 'disable_libpkix==0', { - 'dependencies': [ - 'lib/libpkix/pkix/certsel/certsel.gyp:pkixcertsel', - 'lib/libpkix/pkix/checker/checker.gyp:pkixchecker', - 'lib/libpkix/pkix/crlsel/crlsel.gyp:pkixcrlsel', - 'lib/libpkix/pkix/params/params.gyp:pkixparams', - 'lib/libpkix/pkix/results/results.gyp:pkixresults', - 'lib/libpkix/pkix/store/store.gyp:pkixstore', - 'lib/libpkix/pkix/top/top.gyp:pkixtop', - 'lib/libpkix/pkix/util/util.gyp:pkixutil', - 'lib/libpkix/pkix_pl_nss/module/module.gyp:pkixmodule', - 'lib/libpkix/pkix_pl_nss/pki/pki.gyp:pkixpki', - 'lib/libpkix/pkix_pl_nss/system/system.gyp:pkixsystem', - ], - }], [ 'use_system_sqlite==0', { 'dependencies': [ 'lib/sqlite/sqlite.gyp:sqlite', |