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 /coreconf/OS2.mk | |
| 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 'coreconf/OS2.mk')
| -rw-r--r-- | coreconf/OS2.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/coreconf/OS2.mk b/coreconf/OS2.mk index 17a8df5d2..d0fcdfd37 100644 --- a/coreconf/OS2.mk +++ b/coreconf/OS2.mk @@ -140,6 +140,10 @@ ifndef DLL_PREFIX DLL_PREFIX = $(NULL) endif +ifndef IMPORT_LIB_SUFFIX + IMPORT_LIB_SUFFIX = .$(LIB_SUFFIX) +endif + # # override the TARGETS defined in ruleset.mk, adding IMPORT_LIBRARY # @@ -147,8 +151,3 @@ ifndef TARGETS TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM) endif - -ifdef LIBRARY_NAME - IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib -endif - |