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 /cmd/platlibs.gypi | |
| 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 'cmd/platlibs.gypi')
| -rw-r--r-- | cmd/platlibs.gypi | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/cmd/platlibs.gypi b/cmd/platlibs.gypi index a945ab20f..9963bdd33 100644 --- a/cmd/platlibs.gypi +++ b/cmd/platlibs.gypi @@ -33,6 +33,7 @@ '<(DEPTH)/lib/base/base.gyp:nssb', '<(DEPTH)/lib/freebl/freebl.gyp:freebl', '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3', + '<(DEPTH)/lib/libpkix/libpkix.gyp:libpkix', ], 'conditions': [ [ 'disable_dbm==0', { @@ -41,21 +42,6 @@ '<(DEPTH)/lib/softoken/legacydb/legacydb.gyp:nssdbm', ], }], - [ 'disable_libpkix==0', { - 'dependencies': [ - '<(DEPTH)/lib/libpkix/pkix/certsel/certsel.gyp:pkixcertsel', - '<(DEPTH)/lib/libpkix/pkix/checker/checker.gyp:pkixchecker', - '<(DEPTH)/lib/libpkix/pkix/params/params.gyp:pkixparams', - '<(DEPTH)/lib/libpkix/pkix/results/results.gyp:pkixresults', - '<(DEPTH)/lib/libpkix/pkix/top/top.gyp:pkixtop', - '<(DEPTH)/lib/libpkix/pkix/util/util.gyp:pkixutil', - '<(DEPTH)/lib/libpkix/pkix/crlsel/crlsel.gyp:pkixcrlsel', - '<(DEPTH)/lib/libpkix/pkix/store/store.gyp:pkixstore', - '<(DEPTH)/lib/libpkix/pkix_pl_nss/pki/pki.gyp:pkixpki', - '<(DEPTH)/lib/libpkix/pkix_pl_nss/system/system.gyp:pkixsystem', - '<(DEPTH)/lib/libpkix/pkix_pl_nss/module/module.gyp:pkixmodule' - ], - }], ]},{ # !use_static_libs 'conditions': [ ['moz_fold_libs==0', { |