build: fix build break from merge

nodejs · Nov 18, 2017 · b517f11 · b517f11
1 parent 2515ee1
commit b517f11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/node.gyp b/node.gyp
@@ -378,7 +378,13 @@
             'NODE_PLATFORM="win32"',
             '_UNICODE=1',
           ],
-          'libraries': [ '-lpsapi.lib' ]
+          'libraries': [ '-lpsapi.lib' ],
+          'conditions': [
+            # this is only necessary for chakra on windows because chakra is dynamically linked on windows
+            [ 'node_engine=="chakracore"', {
+              'libraries': [ '-ldbghelp.lib' ],
+            }],
+          ],
         }, { # POSIX
           'defines': [ '__POSIX__' ],
           'sources': [ 'src/backtrace_posix.cc' ],

diff --git a/src/node_trace_events.cc b/src/node_trace_events.cc
@@ -1,6 +1,8 @@
 #include "node_internals.h"
 #include "tracing/agent.h"
 
+#include <unordered_set>
+
 namespace node {
 
 using v8::Context;