diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:29:29 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:29:29 +0000 |
| commit | 77559593f704b95bcbd14776f6dbf63b293b3b7c (patch) | |
| tree | 58007f0f966a0290e6c2a415513eeff2f9dd3973 /gtests/google_test | |
| parent | 880e1e1521f837149841c7bf5e09a6cc30bffa03 (diff) | |
| download | nss-hg-77559593f704b95bcbd14776f6dbf63b293b3b7c.tar.gz | |
Bug 290526 Fix gtests build for WIN% targets r=rrelyea
The google_test gtest build doesn't provide any exports for the
shared library on Windows and the gyp build also builds just a
static library. So build gtest and gtestutil libraries as static.
For whatever reason, the Windows linker doesn't find the main
function inside the gtestutil library, if we don't tell it to
build a console executable. But linking works fine, if the object
file is used directly. But since we can have different main()
objects based on build flags, we enforce building console
applications binaries.
Differential Revision: https://phabricator.services.mozilla.com/D70665
Diffstat (limited to 'gtests/google_test')
| -rw-r--r-- | gtests/google_test/Makefile | 3 | ||||
| -rw-r--r-- | gtests/google_test/manifest.mn | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gtests/google_test/Makefile b/gtests/google_test/Makefile index 21fef55ac..f801ba1d4 100644 --- a/gtests/google_test/Makefile +++ b/gtests/google_test/Makefile @@ -20,7 +20,8 @@ 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 565d79c09..2858dc72d 100644 --- a/gtests/google_test/manifest.mn +++ b/gtests/google_test/manifest.mn @@ -6,8 +6,8 @@ CORE_DEPTH = ../.. DEPTH = ../.. MODULE = gtest + LIBRARY_NAME = gtest -LIBRARY_VERSION = 1 INCLUDES += -Igtest/include/ -Igtest |