diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-06-05 09:41:13 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-06-05 09:41:13 -0700 |
| commit | 9a8ab565dd34784d9f732d1a3c61feef84e2916d (patch) | |
| tree | c5efd4867a2457eb744079c0db5b08a0a196565c /templates | |
| parent | 67b0ac55b2318a5f109cf29d53b95295cd8c3295 (diff) | |
| parent | 1d9a11be82ee1dbeb1294f34e373d5f15625ed9b (diff) | |
Merge pull request #11264 from smulikHakipod/master
Compilation without ALPN support does not work
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/binding.gyp.template | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template index 933174ab6e..204c5b63d4 100644 --- a/templates/binding.gyp.template +++ b/templates/binding.gyp.template @@ -120,6 +120,15 @@ ] }, { 'conditions': [ + ["target_arch=='ia32'", { + "include_dirs": [ "<(node_root_dir)/deps/openssl/config/piii" ] + }], + ["target_arch=='x64'", { + "include_dirs": [ "<(node_root_dir)/deps/openssl/config/k8" ] + }], + ["target_arch=='arm'", { + "include_dirs": [ "<(node_root_dir)/deps/openssl/config/arm" ] + }], ['grpc_alpn=="true"', { 'defines': [ 'TSI_OPENSSL_ALPN_SUPPORT=1' @@ -132,17 +141,6 @@ ], 'include_dirs': [ '<(node_root_dir)/deps/openssl/openssl/include', - ], - 'conditions': [ - ["target_arch=='ia32'", { - "include_dirs": [ "<(node_root_dir)/deps/openssl/config/piii" ] - }], - ["target_arch=='x64'", { - "include_dirs": [ "<(node_root_dir)/deps/openssl/config/k8" ] - }], - ["target_arch=='arm'", { - "include_dirs": [ "<(node_root_dir)/deps/openssl/config/arm" ] - }] ] }], ['OS == "win"', { |