diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-04-20 10:01:19 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-04-20 10:01:19 -0700 |
| commit | 4bcec4a267e65f994738a19772aae07f5e2ffafb (patch) | |
| tree | 1300b5e71b70e088ad6f2b4f0306f3ec5a2dd6c9 /binding.gyp | |
| parent | 8d76ab89a37ed5440daec7bf3bb0f0ad940cc0c7 (diff) | |
| parent | 652210ac2b5ec0b93d9a57bbeb275c334c2b29c9 (diff) | |
Merge pull request #10744 from murgatroid99/node_cares_linux_x86_fix
Node: Don't depend on cares npm package
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/binding.gyp b/binding.gyp index 16334a22a7..9794c87343 100644 --- a/binding.gyp +++ b/binding.gyp @@ -535,6 +535,10 @@ } ] }, + ] + }], + ['OS == "win"', { + 'targets': [ # Only want to compile zlib under Windows { 'cflags': [ @@ -569,7 +573,6 @@ }] ], 'targets': [ - { 'cflags': [ '-std=c99', @@ -648,7 +651,6 @@ 'type': 'static_library', 'dependencies': [ 'gpr', - 'node_modules/cares/deps/cares/cares.gyp:cares', ], 'sources': [ 'src/core/lib/surface/init.c', @@ -951,7 +953,6 @@ "dependencies": [ "grpc", "gpr", - "node_modules/cares/deps/cares/cares.gyp:cares", ] }, { |