diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-17 14:12:04 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-17 14:12:04 +0100 |
| commit | 51b821b3fdc5a7eab2369cb6a6680598a6264b08 (patch) | |
| tree | f3608a518bbb9e31b0a42b9a10742fb11ef5b39b /security/nss/coreconf/config.gypi | |
| parent | 8e44bbb43789e585fab9fc1ce8becc94b45d566c (diff) | |
| parent | 680c3eadb6aaec1f3653636db081a519e0f62ef5 (diff) | |
| download | UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.gz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.lz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.tar.xz UXP-51b821b3fdc5a7eab2369cb6a6680598a6264b08.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'security/nss/coreconf/config.gypi')
| -rw-r--r-- | security/nss/coreconf/config.gypi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/security/nss/coreconf/config.gypi b/security/nss/coreconf/config.gypi index 58137872c..ba1b0c8c5 100644 --- a/security/nss/coreconf/config.gypi +++ b/security/nss/coreconf/config.gypi @@ -108,8 +108,12 @@ 'emit_llvm%': 0, 'nss_public_dist_dir%': '<(nss_dist_dir)/public', 'nss_private_dist_dir%': '<(nss_dist_dir)/private', + # This is only needed when building with --mozpkix-only and might not work + # on all machines. + 'nss_include_dir%': '/usr/include/nss', 'only_dev_random%': 1, 'disable_fips%': 1, + 'mozpkix_only%': 0, }, 'target_defaults': { # Settings specific to targets should go here. @@ -126,6 +130,11 @@ '<(nss_dist_dir)/private/<(module)', ], 'conditions': [ + [ 'mozpkix_only==1 and OS=="linux"', { + 'include_dirs': [ + '<(nss_include_dir)', + ], + }], [ 'disable_fips==1', { 'defines': [ 'NSS_FIPS_DISABLED', |