commit 88162f82c407e3025d3e157705b3aade63da675f
author Michael Lumish <mlumish@google.com> Thu Jan 12 17:37:58 2017 -0800
committer Michael Lumish <mlumish@google.com> Thu Jan 12 17:37:58 2017 -0800
tree 7144e19d238eb05e769f817b5b1ec54c879bedea
parent c518198d9adc423442082130dace7230b5df6e50

Do not use OPENSSL_NO_THREAD normally for Node on Windows

binding.gyp

diff --git a/binding.gyp b/binding.gyp
index bb1c7f0..fd48da8 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -54,14 +54,18 @@
           'GRPC_UV'
         ]
       }],
+      ['runtime=="electron"', {
+        "defines": [
+          'OPENSSL_NO_THREADS'
+        ]
+      }],
       # This is the condition for using boringssl
       ['OS=="win" or runtime=="electron"', {
         "include_dirs": [
           "third_party/boringssl/include"
         ],
         "defines": [
-          'OPENSSL_NO_ASM',
-          'OPENSSL_NO_THREADS'
+          'OPENSSL_NO_ASM'
         ]
       }, {
         # Based on logic above, we know that this must be a non-Windows system

templates/binding.gyp.template

diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template
index 9b9e4e1..7570aa5 100644
--- a/templates/binding.gyp.template
+++ b/templates/binding.gyp.template
@@ -56,14 +56,18 @@
             'GRPC_UV'
           ]
         }],
+        ['runtime=="electron"', {
+          "defines": [
+            'OPENSSL_NO_THREADS'
+          ]
+        }],
         # This is the condition for using boringssl
         ['OS=="win" or runtime=="electron"', {
           "include_dirs": [
             "third_party/boringssl/include"
           ],
           "defines": [
-            'OPENSSL_NO_ASM',
-            'OPENSSL_NO_THREADS'
+            'OPENSSL_NO_ASM'
           ]
         }, {
           # Based on logic above, we know that this must be a non-Windows system