Skip to content

Commit

Permalink
deps: define BUILDING_NGHTTP2 during nghttp2 build
Browse files Browse the repository at this point in the history
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: #15487
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
bnoordhuis authored and jasnell committed Sep 25, 2017
1 parent a95ddc9 commit 5e043a6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 5 additions & 1 deletion deps/nghttp2/nghttp2.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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': {
Expand All @@ -28,6 +31,7 @@
}]
],
'direct_dependent_settings': {
'defines': [ 'NGHTTP2_STATICLIB' ],
'include_dirs': [ 'lib/includes' ]
},
'sources': [
Expand Down
2 changes: 0 additions & 2 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,6 @@
'NODE_WANT_INTERNALS=1',
# Warn when using deprecated V8 APIs.
'V8_DEPRECATION_WARNINGS=1',
# We're using the nghttp2 static lib
'NGHTTP2_STATICLIB'
],
},
{
Expand Down

0 comments on commit 5e043a6

Please sign in to comment.