diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-21 08:08:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-21 08:08:05 -0700 |
| commit | decec093169c93a8e6d033ff9971b0999a2766a3 (patch) | |
| tree | 4564fecaaeead3f75212215c9252b26b16b44ecf /binding.gyp | |
| parent | 6984e1dc5e2687edd69cf3d9c761d6c8386b1fb8 (diff) | |
| parent | 77a4c52cbf3706191640e117b1f9bccddd64f1ac (diff) | |
Merge github.com:grpc/grpc into c++lame
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/binding.gyp b/binding.gyp index b191e36d3f..7974a7eb04 100644 --- a/binding.gyp +++ b/binding.gyp @@ -507,7 +507,7 @@ }, ] }], - ['OS == "win"', { + ['OS == "win" and runtime!="electron"', { 'targets': [ { # IMPORTANT WINDOWS BUILD INFORMATION @@ -518,6 +518,8 @@ # when including the Node headers. The remedy for this is to remove # the OpenSSL headers, from the downloaded Node development package, # which is typically located in `.node-gyp` in your home directory. + # + # This is not true of Electron, which does not have OpenSSL headers. 'target_name': 'WINDOWS_BUILD_WARNING', 'rules': [ { |