diff options
| author |  murgatroid99 <mlumish@google.com> | 2017-04-19 15:54:27 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2017-04-19 15:54:27 -0700 |
| commit | ce67bff2dff6146981928a9f06edf875e6566f4c (patch) | |
| tree | 564f19af118dc29fd996c15c4cb1af9db96f92c5 /binding.gyp | |
| parent | feaee850bf82251f3797749f9b2ef4580b1ba002 (diff) | |
| parent | 5f4758e47850068bf4cda88aa9e5580a9ca7ed85 (diff) | |
Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x
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 e424d136d6..a08bf78263 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': [ { |