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 /cmd/libpkix/testutil | |
| 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 'cmd/libpkix/testutil')
| -rw-r--r-- | cmd/libpkix/testutil/config.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/cmd/libpkix/testutil/config.mk b/cmd/libpkix/testutil/config.mk index 820dbb2d4..f1f6674f9 100644 --- a/cmd/libpkix/testutil/config.mk +++ b/cmd/libpkix/testutil/config.mk @@ -5,11 +5,4 @@ # don't build the static library LIBRARY = - -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) - -endif +RES = |