diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2013-05-06 13:23:52 -0700 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2013-05-06 13:23:52 -0700 |
| commit | ca900f4d77bcb4c75564fe4e426ab129a3cfbefb (patch) | |
| tree | e5b723f27047839c48a6f6ef7055057f3b96fae6 /cmd/platlibs.mk | |
| parent | 105887df91ddc8e96d6e0e48e49bfc0472e87f3f (diff) | |
| download | nss-hg-ca900f4d77bcb4c75564fe4e426ab129a3cfbefb.tar.gz | |
Bug 835919 - Allow optionally building nss without softoken in the tree, r=wtc
- Remove unneede changes in to the test scrips
- Add needed comments for package maintainers and reviewers
- Fix whitespace usage on the makefiles
Diffstat (limited to 'cmd/platlibs.mk')
| -rw-r--r-- | cmd/platlibs.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd/platlibs.mk b/cmd/platlibs.mk index 200faf701..0f07910af 100644 --- a/cmd/platlibs.mk +++ b/cmd/platlibs.mk @@ -36,11 +36,13 @@ ifdef USE_STATIC_LIBS DEFINES += -DNSS_USE_STATIC_LIBS # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) -ifndef USE_SYSTEM_FREEBL +ifndef NSS_USE_SYSTEM_FREEBL CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) SOFTOKENLIB=$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) else -# Use the system freebl and softoken libraries +# Use the system installed freebl static library and set softoken one to empty. +# Some tools need to link statically with freebl but none with softoken. Only +# the softoken shared library, not the static one, is installed in the system. CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) SOFTOKENLIB= EXTRA_SHARED_LIBS += \ |