diff options
author | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-05-23 16:16:58 +0200 |
---|---|---|
committer | Franziskus Kiefer <franziskuskiefer@gmail.com> | 2017-05-23 16:16:58 +0200 |
commit | 5eccc68a88e91b28316b440f3c6d4309a6c6efd2 (patch) | |
tree | 4458a96fc98901b38bad1e148e671d8ceca362b2 | |
parent | 751282488e021a1f6b7fc615a17129778794bfd0 (diff) | |
download | nss-hg-5eccc68a88e91b28316b440f3c6d4309a6c6efd2.tar.gz |
Bug 1355038 - fix windows gyp builds where using static builds, r=ttaubert
Differential Revision: https://nss-review.dev.mozaws.net/D325
-rw-r--r-- | gtests/freebl_gtest/freebl_gtest.gyp | 10 | ||||
-rw-r--r-- | gtests/util_gtest/util_gtest.gyp | 14 |
2 files changed, 22 insertions, 2 deletions
diff --git a/gtests/freebl_gtest/freebl_gtest.gyp b/gtests/freebl_gtest/freebl_gtest.gyp index d74a39b4f..9a0449553 100644 --- a/gtests/freebl_gtest/freebl_gtest.gyp +++ b/gtests/freebl_gtest/freebl_gtest.gyp @@ -50,6 +50,16 @@ '<(DEPTH)/lib/pki/pki.gyp:nsspki', '<(DEPTH)/lib/ssl/ssl.gyp:ssl', ], + 'conditions': [ + [ 'OS=="win"', { + 'libraries': [ + 'advapi32.lib', + ], + }], + ], + 'defines': [ + 'NSS_USE_STATIC_LIBS' + ], }, ], 'target_defaults': { diff --git a/gtests/util_gtest/util_gtest.gyp b/gtests/util_gtest/util_gtest.gyp index 25711ddbd..d0ea99e5d 100644 --- a/gtests/util_gtest/util_gtest.gyp +++ b/gtests/util_gtest/util_gtest.gyp @@ -13,7 +13,7 @@ 'sources': [ 'util_utf8_unittest.cc', 'util_b64_unittest.cc', - 'util_pkcs11uri_unittest.cc', + 'util_pkcs11uri_unittest.cc', '<(DEPTH)/gtests/common/gtests.cc', ], 'dependencies': [ @@ -29,7 +29,17 @@ '<(DEPTH)/lib/dev/dev.gyp:nssdev', '<(DEPTH)/lib/pki/pki.gyp:nsspki', '<(DEPTH)/lib/ssl/ssl.gyp:ssl', - ] + ], + 'conditions': [ + [ 'OS=="win"', { + 'libraries': [ + 'advapi32.lib', + ], + }], + ], + 'defines': [ + 'NSS_USE_STATIC_LIBS' + ], } ], 'target_defaults': { |