diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:30:24 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:30:24 +0000 |
| commit | 8d55ac83ed57c82b2784e074751a33fe5e2dc21c (patch) | |
| tree | cf757455b93d8a5689316c239bb9fe9179e358b3 /lib/smime | |
| parent | f9cb815e1ed96aab831de80c82210176287137f5 (diff) | |
| download | nss-hg-8d55ac83ed57c82b2784e074751a33fe5e2dc21c.tar.gz | |
Bug 1629553 Rework the LIBRARY_NAME ruleset r=rrelyea
* Drop the WIN% "32" default DLL suffix
* Add default resource file handling => drop default RES
* Generate IMPORT_LIBRARY based on IMPORT_LIB_SUFFIX and
SHARED_LIBRARY, so we can drop all the explicit empty
IMPORT_LIBRARY lines
Originally this patch also tried to add a default MAPFILE rule,
but this fails, because the ARCH makefiles set linker flags
based on an existing MAPFILE variable.
Differential Revision: https://phabricator.services.mozilla.com/D70369
Diffstat (limited to 'lib/smime')
| -rw-r--r-- | lib/smime/config.mk | 7 | ||||
| -rw-r--r-- | lib/smime/manifest.mn | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/smime/config.mk b/lib/smime/config.mk index 85d39e825..76aab7544 100644 --- a/lib/smime/config.mk +++ b/lib/smime/config.mk @@ -7,13 +7,6 @@ RELEASE_LIBS = $(TARGETS) ifeq (,$(filter-out WIN%,$(OS_TARGET))) -# don't want the 32 in the shared library name -SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - -RES = $(OBJDIR)/smime.res -RESNAME = smime.rc - ifdef NS_USE_GCC EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ diff --git a/lib/smime/manifest.mn b/lib/smime/manifest.mn index e049d8873..f453d2594 100644 --- a/lib/smime/manifest.mn +++ b/lib/smime/manifest.mn @@ -17,7 +17,6 @@ PRIVATE_EXPORTS = \ $(NULL) MODULE = nss -MAPFILE = $(OBJDIR)/smime.def CSRCS = \ cmsarray.c \ @@ -46,6 +45,7 @@ CSRCS = \ LIBRARY_NAME = smime LIBRARY_VERSION = 3 +MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def # This part of the code, including all sub-dirs, can be optimized for size export ALLOW_OPT_CODE_SIZE = 1 |