From 3c777bb37f33b1fc6c6d1df4fe5a27d7519935fd Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Wed, 20 Sep 2017 11:43:48 +0200
Subject: 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>
---
 deps/nghttp2/nghttp2.gyp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'deps/nghttp2/nghttp2.gyp')

diff --git a/deps/nghttp2/nghttp2.gyp b/deps/nghttp2/nghttp2.gyp
index 8e35160929..8da81485e5 100644
--- a/deps/nghttp2/nghttp2.gyp
+++ b/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': [
-- 
cgit v1.2.3