diff options
| author | Martin Thomson <mt@lowentropy.net> | 2019-05-16 09:43:04 +0000 |
|---|---|---|
| committer | Martin Thomson <mt@lowentropy.net> | 2019-05-16 09:43:04 +0000 |
| commit | 390d9cfd74daaa3542ba11456ec36f0db74fd4df (patch) | |
| tree | 57d10eb971eca40a015aacb06b8fafdf6cf2c6a7 /gtests/common | |
| parent | 32e4cba5ef62427b02a21d9a1225c9405c922f9b (diff) | |
| download | nss-hg-390d9cfd74daaa3542ba11456ec36f0db74fd4df.tar.gz | |
Bug 1551129 - Enable --static build on windows, r=kevinjacobs
Summary:
Refinements for static building and linking.
Reviewers: KevinJacobs
Reviewed By: KevinJacobs
Bug #: 1551129
Differential Revision: https://phabricator.services.mozilla.com/D30853
Diffstat (limited to 'gtests/common')
| -rw-r--r-- | gtests/common/gtest.gypi | 7 | ||||
| -rw-r--r-- | gtests/common/gtests.cc | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gtests/common/gtest.gypi b/gtests/common/gtest.gypi index c4865bba5..919c23aa3 100644 --- a/gtests/common/gtest.gypi +++ b/gtests/common/gtest.gypi @@ -21,6 +21,13 @@ 'libraries': [ '-lws2_32', ], + 'conditions': [ + ['static_libs==1', { + 'libraries': [ + '-ladvapi32', + ], + }], + ], }], ['OS=="android"', { 'libraries': [ diff --git a/gtests/common/gtests.cc b/gtests/common/gtests.cc index 7e585791b..d0f21ee04 100644 --- a/gtests/common/gtests.cc +++ b/gtests/common/gtests.cc @@ -1,6 +1,5 @@ #include "nspr.h" #include "nss.h" -#include "ssl.h" #include <cstdlib> @@ -29,9 +28,6 @@ int main(int argc, char **argv) { if (NSS_Initialize(workdir, "", "", SECMOD_DB, flags) != SECSuccess) { return 1; } - if (NSS_SetDomesticPolicy() != SECSuccess) { - return 1; - } int rv = RUN_ALL_TESTS(); if (NSS_Shutdown() != SECSuccess) { |