diff options
| author | Daiki Ueno <dueno@redhat.com> | 2017-06-01 10:47:30 +0200 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2017-06-01 10:47:30 +0200 |
| commit | 2821ed9da4b05bceddb930961be28e07d320c7e6 (patch) | |
| tree | c1b6358e1f44b6fe9f6ee33dbec494217357391c /cmd/platlibs.mk | |
| parent | 3adde469bf542407a9f9a42593500af8bad76738 (diff) | |
| download | nss-hg-2821ed9da4b05bceddb930961be28e07d320c7e6.tar.gz | |
Bug 1280846 - tests: adjust gtests to compile under modular builds, r=franziskus
Diffstat (limited to 'cmd/platlibs.mk')
| -rw-r--r-- | cmd/platlibs.mk | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/cmd/platlibs.mk b/cmd/platlibs.mk index 25b4bdffe..a59d03d06 100644 --- a/cmd/platlibs.mk +++ b/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) @@ -238,6 +231,7 @@ EXTRA_SHARED_LIBS += \ -lplds4 \ -lnspr4 \ $(NULL) +ifndef NSS_BUILD_UTIL_ONLY ifndef NSS_BUILD_SOFTOKEN_ONLY EXTRA_SHARED_LIBS += \ -lssl3 \ @@ -245,6 +239,7 @@ EXTRA_SHARED_LIBS += \ -lnss3 endif endif +endif ifdef SOFTOKEN_LIB_DIR ifdef NSS_USE_SYSTEM_FREEBL |