diff options
| author |  jiangtaoli2016 <jiangtao@google.com> | 2017-04-24 09:02:11 -0700 |
|---|---|---|
| committer | jiangtaoli2016 <jiangtao@google.com> | 2017-04-24 09:02:11 -0700 |
| commit | 6cb5e276a43a3700bc85dac38df271f8065db79d (patch) | |
| tree | 5ba375922f7bf2ae223ae2a51e9b506397836812 /binding.gyp | |
| parent | e223a6a042b3123a2aee25ec0d3fe42ffd0c43e2 (diff) | |
| parent | 18548b8a0b2b703380e0c9525eb143027eaab9f3 (diff) | |
Merge branch 'master' into new_tsi
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 35aa5e469b..017616ab2e 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': [ { |