From 1ce713c7f5859b992729a5be80f5a775a23db929 Mon Sep 17 00:00:00 2001
From: Franziskus Kiefer <franziskuskiefer@gmail.com>
Date: Tue, 23 May 2017 16:16:58 +0200
Subject: [PATCH] Bug 1355038 - fix windows gyp builds where using static
 builds, r=ttaubert

Differential Revision: https://nss-review.dev.mozaws.net/D325

--HG--
extra : amend_source : 06ba65d4862bdd4ad8002552bb57d264d4828fd1
---
 gtests/freebl_gtest/freebl_gtest.gyp | 10 ++++++++++
 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 d74a39b4f8..9a0449553c 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 25711ddbd7..d0ea99e5d2 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': {