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/sqlite | |
| 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/sqlite')
| -rw-r--r-- | lib/sqlite/config.mk | 12 | ||||
| -rw-r--r-- | lib/sqlite/manifest.mn | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/lib/sqlite/config.mk b/lib/sqlite/config.mk index b0e9390f1..a3b52bd4b 100644 --- a/lib/sqlite/config.mk +++ b/lib/sqlite/config.mk @@ -3,18 +3,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# can't do this in manifest.mn because OS_TARGET isn't defined there. -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)/$(LIBRARY_NAME).res -#RESNAME = $(LIBRARY_NAME).rc -endif - ifeq ($(OS_TARGET),AIX) EXTRA_LIBS += -lpthreads ifdef BUILD_OPT diff --git a/lib/sqlite/manifest.mn b/lib/sqlite/manifest.mn index be411a6db..44422affd 100644 --- a/lib/sqlite/manifest.mn +++ b/lib/sqlite/manifest.mn @@ -8,7 +8,9 @@ MODULE = nss LIBRARY_NAME = sqlite LIBRARY_VERSION = 3 -MAPFILE = $(OBJDIR)/sqlite.def +MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def +RES = $(NULL) + DEFINES += -DSQLITE_THREADSAFE=1 PRIVATE_EXPORTS = \ |