diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-20 19:24:41 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-20 19:24:41 +0000 |
| commit | 3df4584b9c1ab0425205bdef486a4744f6ec7d73 (patch) | |
| tree | 1fcebf342c33df2847c68167608b7eabb77e540b /binding.gyp | |
| parent | 227e11bdee93bcc88abf664be23aab8cafbaf653 (diff) | |
| parent | 14ff003ae48f6bafe379e7590573834bc563a7cb (diff) | |
Merge github.com:grpc/grpc into epex4
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 da37c432b6..82242c057c 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': [ { |