diff options
| author | wtchang%redhat.com <devnull@localhost> | 2006-09-01 22:09:04 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2006-09-01 22:09:04 +0000 |
| commit | 5ba57754c39f9fd4a14707a075992e5b0fc9b9b6 (patch) | |
| tree | 2c75c720b998623adba2cb36c6f99a52129afe44 | |
| parent | 8291588db2877cd60f7c78d09b1b37acd7480959 (diff) | |
| download | nss-hg-5ba57754c39f9fd4a14707a075992e5b0fc9b9b6.tar.gz | |
Bugzilla bug 342582: this program may use NSPR but should not link with
any NSS libraries.
Tag: NSS_3_11_BRANCH
| -rwxr-xr-x | security/nss/cmd/pk11mode/Makefile | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/security/nss/cmd/pk11mode/Makefile b/security/nss/cmd/pk11mode/Makefile index a62dc10cc..9e2708a76 100755 --- a/security/nss/cmd/pk11mode/Makefile +++ b/security/nss/cmd/pk11mode/Makefile @@ -56,10 +56,23 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk +ifeq ($(OS_ARCH), WINNT) + +EXTRA_LIBS += \ + $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ + $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \ + $(NULL) + +else + +EXTRA_SHARED_LIBS += \ + -L$(NSPR_LIB_DIR) \ + -lplc4 \ + -lplds4 \ + -lnspr4 \ + $(NULL) -ifdef NSS_ENABLE_ECC -DEFINES += -DNSS_ENABLE_ECC endif ####################################################################### @@ -78,4 +91,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -include ../platrules.mk |