diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-01-13 09:06:40 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-01-13 09:06:40 -0800 |
| commit | a7fa10005a43ff01b73f53e2e52fc048974951cc (patch) | |
| tree | 2734cd40a2beba804a2552b5bf0f02254dbaa42a | |
| parent | 93d0b580a51af6e9c099164424040dfd4d6a71f3 (diff) | |
| parent | 88162f82c407e3025d3e157705b3aade63da675f (diff) | |
Merge branch 'node_electron_build' of github.com:murgatroid99/grpc into node_electron_build
| -rw-r--r-- | binding.gyp | 8 | ||||
| -rw-r--r-- | templates/binding.gyp.template | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/binding.gyp b/binding.gyp index bb1c7f0a3a..fd48da875a 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 diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template index 9b9e4e116d..7570aa5e7e 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 |