diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2013-04-29 10:33:35 -0700 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2013-04-29 10:33:35 -0700 |
| commit | 1228060b17167808a4d8dcd5a78877d533e6037c (patch) | |
| tree | 5449d01aaf6970badfe9348c9729500726757f3e /cmd/shlibsign | |
| parent | ccd65ba45849323a43d6614539e075320ee5963b (diff) | |
| download | nss-hg-1228060b17167808a4d8dcd5a78877d533e6037c.tar.gz | |
Bug 835919 - Allow optionally building nss without softoken in the tree, r=rrelyea
Diffstat (limited to 'cmd/shlibsign')
| -rw-r--r-- | cmd/shlibsign/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile index 4f1b297e3..b77279310 100644 --- a/cmd/shlibsign/Makefile +++ b/cmd/shlibsign/Makefile @@ -45,7 +45,10 @@ endif # sign any and all shared libraries that contain the word freebl - +ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)) +CHECKLIBS= +CHECKLOC= +else CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) ifndef NSS_DISABLE_DBM @@ -55,7 +58,7 @@ CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) MD_LIB_RELEASE_FILES = $(CHECKLOC) ALL_TRASH += $(CHECKLOC) - +endif ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # |