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

Merge pull request #589 from murgatroid99/boringssl_threads 

Remove use of OPENSSL_NO_THREADS with BoringSSL
This commit is contained in:
Michael Lumish 2018-10-24 15:26:25 -07:00 committed by GitHub
parent 8df65a91a2 9b5ed6240b
commit 290a9a0e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,11 +118,6 @@
'GPR_MUSL_LIBC_COMPAT'
]
}],
['OS!="win" and runtime=="electron"', {
"defines": [
'OPENSSL_NO_THREADS'
]
}],
# This is the condition for using boringssl
['OS=="win" or runtime=="electron"', {
"include_dirs": [
@ -228,6 +223,9 @@
'cflags': [
'-Wno-implicit-fallthrough'
],
'defines': [
'_XOPEN_SOURCE=700'
],
'dependencies': [
],
'sources': [

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

@ -102,11 +102,6 @@
'GPR_MUSL_LIBC_COMPAT'
]
}],
['OS!="win" and runtime=="electron"', {
"defines": [
'OPENSSL_NO_THREADS'
]
}],
# This is the condition for using boringssl
['OS=="win" or runtime=="electron"', {
"include_dirs": [
@ -200,6 +195,9 @@
'cflags': [
'-Wno-implicit-fallthrough'
],
'defines': [
'_XOPEN_SOURCE=700'
],
'dependencies': [
% for dep in getattr(lib, 'deps', []):
'${dep}',