Skip to content

Commit 72f4a83

Browse files
committed
build: tidy up additional libraries on Windows
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 <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
1 parent 06c803d commit 72f4a83

File tree

1 file changed

+7
-31
lines changed

1 file changed

+7
-31
lines changed

node.gyp

+7-31
Original file line numberDiff line numberDiff line change
@@ -345,16 +345,7 @@
345345
],
346346
'conditions': [
347347
['OS=="win"', {
348-
'libraries': [
349-
'dbghelp.lib',
350-
'PsApi.lib',
351-
'Ws2_32.lib',
352-
],
353-
'dll_files': [
354-
'dbghelp.dll',
355-
'PsApi.dll',
356-
'Ws2_32.dll',
357-
],
348+
'libraries': [ 'Ws2_32' ],
358349
}],
359350
],
360351
}],
@@ -623,7 +614,10 @@
623614
],
624615
}],
625616
],
626-
'libraries': [ '-lpsapi.lib' ]
617+
'libraries': [
618+
'Dbghelp',
619+
'Psapi',
620+
],
627621
}],
628622
[ 'node_use_etw=="true"', {
629623
'defines': [ 'HAVE_ETW=1' ],
@@ -718,16 +712,7 @@
718712
],
719713
'conditions': [
720714
['OS=="win"', {
721-
'libraries': [
722-
'dbghelp.lib',
723-
'PsApi.lib',
724-
'Ws2_32.lib',
725-
],
726-
'dll_files': [
727-
'dbghelp.dll',
728-
'PsApi.dll',
729-
'Ws2_32.dll',
730-
],
715+
'libraries': [ 'Ws2_32' ],
731716
}],
732717
],
733718
}],
@@ -1083,16 +1068,7 @@
10831068
],
10841069
'conditions': [
10851070
['OS=="win"', {
1086-
'libraries': [
1087-
'dbghelp.lib',
1088-
'PsApi.lib',
1089-
'Ws2_32.lib',
1090-
],
1091-
'dll_files': [
1092-
'dbghelp.dll',
1093-
'PsApi.dll',
1094-
'Ws2_32.dll',
1095-
],
1071+
'libraries': [ 'Ws2_32' ],
10961072
}],
10971073
],
10981074
}],

0 commit comments

Comments
 (0)