diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-06 11:46:26 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-06 11:46:26 +0100 |
| commit | f017b749ea9f1586d2308504553d40bf4cc5439d (patch) | |
| tree | c6033924a0de9be1ab140596e305898c651bf57e /security/nss/cmd/platlibs.mk | |
| parent | 7c728b3c7680662fc4e92b5d03697b8339560b08 (diff) | |
| download | UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.gz UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.lz UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.tar.xz UXP-f017b749ea9f1586d2308504553d40bf4cc5439d.zip | |
Update NSS to 3.32.1-RTM
Diffstat (limited to 'security/nss/cmd/platlibs.mk')
| -rw-r--r-- | security/nss/cmd/platlibs.mk | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index 032eed07b..a59d03d06 100644 --- a/security/nss/cmd/platlibs.mk +++ b/security/nss/cmd/platlibs.mk @@ -32,6 +32,12 @@ else DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) endif +ifeq ($(NSS_BUILD_UTIL_ONLY),1) +SECTOOL_LIB = $(NULL) +else +SECTOOL_LIB = $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) +endif + ifdef USE_STATIC_LIBS DEFINES += -DNSS_USE_STATIC_LIBS @@ -70,20 +76,10 @@ endif endif NSS_LIBS_1= -SECTOOL_LIB= NSS_LIBS_2= NSS_LIBS_3= NSS_LIBS_4= -ifneq ($(NSS_BUILD_UTIL_ONLY),1) -SECTOOL_LIB = \ - $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \ - $(NULL) -else -SECTOOL_LIB = \ - $(NULL) -endif - ifneq ($(NSS_BUILD_SOFTOKEN_ONLY),1) ifeq ($(OS_ARCH), WINNT) # breakdown for windows @@ -121,9 +117,6 @@ NSS_LIBS_1 = \ $(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \ $(NULL) -SECTOOL_LIB = \ - $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \ - $(NULL) NSS_LIBS_2 = \ $(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \ @@ -201,7 +194,7 @@ ifeq ($(OS_ARCH), WINNT) # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) EXTRA_LIBS += \ - $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \ + $(SECTOOL_LIB) \ $(NSSUTIL_LIB_DIR)/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \ $(DIST)/lib/$(IMPORT_LIB_PREFIX)smime3$(IMPORT_LIB_SUFFIX) \ $(DIST)/lib/$(IMPORT_LIB_PREFIX)ssl3$(IMPORT_LIB_SUFFIX) \ @@ -220,7 +213,7 @@ else # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) EXTRA_LIBS += \ - $(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \ + $(SECTOOL_LIB) \ $(NULL) ifeq ($(OS_ARCH), AIX) @@ -231,9 +224,6 @@ endif # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ - -lssl3 \ - -lsmime3 \ - -lnss3 \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ -L$(NSPR_LIB_DIR) \ @@ -241,6 +231,14 @@ EXTRA_SHARED_LIBS += \ -lplds4 \ -lnspr4 \ $(NULL) +ifndef NSS_BUILD_UTIL_ONLY +ifndef NSS_BUILD_SOFTOKEN_ONLY +EXTRA_SHARED_LIBS += \ + -lssl3 \ + -lsmime3 \ + -lnss3 +endif +endif endif ifdef SOFTOKEN_LIB_DIR |