diff options
author | Eugen Sawin <esawin@mozilla.com> | 2016-06-22 11:45:00 +0200 |
---|---|---|
committer | Eugen Sawin <esawin@mozilla.com> | 2016-06-22 11:45:00 +0200 |
commit | 9d29ce01971b3bc2754748cdcfcd2a304971da1f (patch) | |
tree | 4f437bf60e9984322fd5ea644367a18ea70d069e /lib/nss/config.mk | |
parent | 98da854c9ffc7634bd8032d0ce07f2549d890853 (diff) | |
download | nss-hg-9d29ce01971b3bc2754748cdcfcd2a304971da1f.tar.gz |
Bug 1227795 - Add NSS_DISABLE_LIBPKIX to allow compiling without libpkix, r=franziskus,wtc
Diffstat (limited to 'lib/nss/config.mk')
-rw-r--r-- | lib/nss/config.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/nss/config.mk b/lib/nss/config.mk index 170e99922..43bfac6dd 100644 --- a/lib/nss/config.mk +++ b/lib/nss/config.mk @@ -79,6 +79,10 @@ SHARED_LIBRARY_DIRS = \ ../pki \ ../dev \ ../base \ + $(NULL) + +ifndef NSS_DISABLE_LIBPKIX +SHARED_LIBRARY_DIRS += \ ../libpkix/pkix/certsel \ ../libpkix/pkix/checker \ ../libpkix/pkix/params \ @@ -91,6 +95,7 @@ SHARED_LIBRARY_DIRS = \ ../libpkix/pkix_pl_nss/system \ ../libpkix/pkix_pl_nss/module \ $(NULL) +endif ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET))) ifndef NS_USE_GCC |