aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/binding.gyp.template
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-03-01 13:44:22 -0800
committerGravatar Craig Tiller <ctiller@google.com>2017-03-01 13:44:22 -0800
commit9d3203a5ea195801eb7358beced8c2f472a7d9b2 (patch)
treea7ba913e354398c71b274662cf5f5a15436ff293 /templates/binding.gyp.template
parent36dd42ec01d864982b20719d0a12a11d273e1397 (diff)
parent07ad1b9c7c785554b6734eb5c0e2fcd2b14691b2 (diff)
Merge github.com:grpc/grpc into trim-the-locks
Diffstat (limited to 'templates/binding.gyp.template')
-rw-r--r--templates/binding.gyp.template4
1 files changed, 1 insertions, 3 deletions
diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template
index 9d7034e18b..2290411d54 100644
--- a/templates/binding.gyp.template
+++ b/templates/binding.gyp.template
@@ -56,10 +56,8 @@
'GPR_BACKWARDS_COMPATIBILITY_MODE'
],
'conditions': [
- ['runtime=="node" and grpc_uv=="true"', {
+ ['grpc_uv=="true"', {
'defines': [
- # Disabling this while bugs are ironed out. Uncomment this to
- # re-enable libuv integration in C core.
'GRPC_UV'
]
}],