grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove use of OPENSSL_NO_THREADS with BoringSSL

This commit is contained in:
murgatroid99 2018-10-24 10:38:25 -07:00
parent 8df65a91a2
commit 3eb67d8038
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/grpc-native-core/binding.gyp
View File

@ -91,7 +91,8 @@
'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=0', 'GRPC_ARES=0',
'GRPC_UV', 'GRPC_UV',
'GRPC_NODE_VERSION="1.16.0-pre1"' 'GRPC_NODE_VERSION="1.16.0-pre1"',
'_XOPEN_SOURCE=500'
], ],
'conditions': [ 'conditions': [
['grpc_gcov=="true"', { ['grpc_gcov=="true"', {
@ -118,11 +119,6 @@
'GPR_MUSL_LIBC_COMPAT' 'GPR_MUSL_LIBC_COMPAT'
] ]
}], }],
['OS!="win" and runtime=="electron"', {
"defines": [
'OPENSSL_NO_THREADS'
]
}],
# This is the condition for using boringssl # This is the condition for using boringssl
['OS=="win" or runtime=="electron"', { ['OS=="win" or runtime=="electron"', {
"include_dirs": [ "include_dirs": [

8
packages/grpc-native-core/templates/binding.gyp.template
View File

@ -83,7 +83,8 @@
'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GPR_BACKWARDS_COMPATIBILITY_MODE',
'GRPC_ARES=0', 'GRPC_ARES=0',
'GRPC_UV', 'GRPC_UV',
'GRPC_NODE_VERSION="${settings.get('node_version', settings.version)}"' 'GRPC_NODE_VERSION="${settings.get('node_version', settings.version)}"',
'_XOPEN_SOURCE=500'
], ],
'conditions': [ 'conditions': [
['grpc_gcov=="true"', { ['grpc_gcov=="true"', {
@ -102,11 +103,6 @@
'GPR_MUSL_LIBC_COMPAT' 'GPR_MUSL_LIBC_COMPAT'
] ]
}], }],
['OS!="win" and runtime=="electron"', {
"defines": [
'OPENSSL_NO_THREADS'
]
}],
# This is the condition for using boringssl # This is the condition for using boringssl
['OS=="win" or runtime=="electron"', { ['OS=="win" or runtime=="electron"', {
"include_dirs": [ "include_dirs": [