Skip to content

Commit

Permalink
build: tidy up additional libraries on Windows
Browse files Browse the repository at this point in the history
The report functionality that depended on `Dbghelp.lib` and `Psapi.lib`
are actually in `src/debug_utils.cc` and are not dependent on the
report functionality being enabled.

PR-URL: #27138
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
richardlau committed Apr 11, 2019
1 parent 06c803d commit 72f4a83
Showing 1 changed file with 7 additions and 31 deletions.
38 changes: 7 additions & 31 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -345,16 +345,7 @@
],
'conditions': [
['OS=="win"', {
'libraries': [
'dbghelp.lib',
'PsApi.lib',
'Ws2_32.lib',
],
'dll_files': [
'dbghelp.dll',
'PsApi.dll',
'Ws2_32.dll',
],
'libraries': [ 'Ws2_32' ],
}],
],
}],
Expand Down Expand Up @@ -623,7 +614,10 @@
],
}],
],
'libraries': [ '-lpsapi.lib' ]
'libraries': [
'Dbghelp',
'Psapi',
],
}],
[ 'node_use_etw=="true"', {
'defines': [ 'HAVE_ETW=1' ],
Expand Down Expand Up @@ -718,16 +712,7 @@
],
'conditions': [
['OS=="win"', {
'libraries': [
'dbghelp.lib',
'PsApi.lib',
'Ws2_32.lib',
],
'dll_files': [
'dbghelp.dll',
'PsApi.dll',
'Ws2_32.dll',
],
'libraries': [ 'Ws2_32' ],
}],
],
}],
Expand Down Expand Up @@ -1083,16 +1068,7 @@
],
'conditions': [
['OS=="win"', {
'libraries': [
'dbghelp.lib',
'PsApi.lib',
'Ws2_32.lib',
],
'dll_files': [
'dbghelp.dll',
'PsApi.dll',
'Ws2_32.dll',
],
'libraries': [ 'Ws2_32' ],
}],
],
}],
Expand Down

0 comments on commit 72f4a83

Please sign in to comment.