Browse Source

deps: define BUILDING_NGHTTP2 during nghttp2 build

Define BUILDING_NGHTTP2 in order that NGHTTP2_EXTERN is properly defined
when building the nghttp2 static library.

Move NGHTTP2_STATICLIB out of node.gyp because it is a property of the
nghttp2 static library, not the node executable.

PR-URL: https://github.com/nodejs/node/pull/15487
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
canary-base
Ben Noordhuis 7 years ago
committed by Ruben Bridgewater
parent
commit
3c777bb37f
No known key found for this signature in database GPG Key ID: F07496B3EB3C1762
  1. 6
      deps/nghttp2/nghttp2.gyp
  2. 2
      node.gyp

6
deps/nghttp2/nghttp2.gyp

@ -9,13 +9,16 @@
'target_name': 'nghttp2',
'type': 'static_library',
'include_dirs': ['lib/includes'],
'defines': [
'BUILDING_NGHTTP2',
'NGHTTP2_STATICLIB',
],
'conditions': [
['OS=="win"', {
'defines': [
'WIN32',
'_WINDOWS',
'HAVE_CONFIG_H',
'NGHTTP2_STATICLIB',
],
'msvs_settings': {
'VCCLCompilerTool': {
@ -28,6 +31,7 @@
}]
],
'direct_dependent_settings': {
'defines': [ 'NGHTTP2_STATICLIB' ],
'include_dirs': [ 'lib/includes' ]
},
'sources': [

2
node.gyp

@ -301,8 +301,6 @@
'NODE_WANT_INTERNALS=1',
# Warn when using deprecated V8 APIs.
'V8_DEPRECATION_WARNINGS=1',
# We're using the nghttp2 static lib
'NGHTTP2_STATICLIB'
],
},
{

Loading…
Cancel
Save