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 /gtests/google_test | |
| 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 'gtests/google_test')
| -rw-r--r-- | gtests/google_test/Makefile | 2 | ||||
| -rw-r--r-- | gtests/google_test/manifest.mn | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gtests/google_test/Makefile b/gtests/google_test/Makefile index f801ba1d4..0d547e080 100644 --- a/gtests/google_test/Makefile +++ b/gtests/google_test/Makefile @@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### -SHARED_LIBRARY = $(NULL) -IMPORT_LIBRARY = $(NULL) ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # diff --git a/gtests/google_test/manifest.mn b/gtests/google_test/manifest.mn index 2858dc72d..7c60f11e5 100644 --- a/gtests/google_test/manifest.mn +++ b/gtests/google_test/manifest.mn @@ -8,6 +8,7 @@ DEPTH = ../.. MODULE = gtest LIBRARY_NAME = gtest +SHARED_LIBRARY = $(NULL) INCLUDES += -Igtest/include/ -Igtest |