Skip to content

Commit 5e043a6

Browse files
bnoordhuisjasnell
authored andcommitted
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: #15487 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent a95ddc9 commit 5e043a6

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

deps/nghttp2/nghttp2.gyp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
'target_name': 'nghttp2',
1010
'type': 'static_library',
1111
'include_dirs': ['lib/includes'],
12+
'defines': [
13+
'BUILDING_NGHTTP2',
14+
'NGHTTP2_STATICLIB',
15+
],
1216
'conditions': [
1317
['OS=="win"', {
1418
'defines': [
1519
'WIN32',
1620
'_WINDOWS',
1721
'HAVE_CONFIG_H',
18-
'NGHTTP2_STATICLIB',
1922
],
2023
'msvs_settings': {
2124
'VCCLCompilerTool': {
@@ -28,6 +31,7 @@
2831
}]
2932
],
3033
'direct_dependent_settings': {
34+
'defines': [ 'NGHTTP2_STATICLIB' ],
3135
'include_dirs': [ 'lib/includes' ]
3236
},
3337
'sources': [

node.gyp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,6 @@
292292
'NODE_WANT_INTERNALS=1',
293293
# Warn when using deprecated V8 APIs.
294294
'V8_DEPRECATION_WARNINGS=1',
295-
# We're using the nghttp2 static lib
296-
'NGHTTP2_STATICLIB'
297295
],
298296
},
299297
{

0 commit comments

Comments
 (0)