Merge branch 'node_electron_build' of github.com:murgatroid99/grpc into node_electron_build

8 years ago · a7fa10005a
parent 93d0b580a5 88162f82c4
commit a7fa10005a
2 changed files with 12 additions and 4 deletions
--- 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
--- 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