diff options
author | Richard Lau <riclau@uk.ibm.com> | 2019-04-08 19:41:52 +0100 |
---|---|---|
committer | Richard Lau <riclau@uk.ibm.com> | 2019-04-10 20:21:55 -0400 |
commit | 72f4a830d7c387d9d8f47ff1b5ccf98244032733 (patch) | |
tree | 5032f5c87251327b6968507c49119dd7dbbdbcb0 | |
parent | 06c803d9b929880dc21eeb5f8eb40fe17ff2e499 (diff) | |
download | android-node-v8-72f4a830d7c387d9d8f47ff1b5ccf98244032733.tar.gz android-node-v8-72f4a830d7c387d9d8f47ff1b5ccf98244032733.tar.bz2 android-node-v8-72f4a830d7c387d9d8f47ff1b5ccf98244032733.zip |
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: https://github.com/nodejs/node/pull/27138
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
-rw-r--r-- | node.gyp | 38 |
1 files changed, 7 insertions, 31 deletions
@@ -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' ], }], ], }], @@ -623,7 +614,10 @@ ], }], ], - 'libraries': [ '-lpsapi.lib' ] + 'libraries': [ + 'Dbghelp', + 'Psapi', + ], }], [ 'node_use_etw=="true"', { 'defines': [ 'HAVE_ETW=1' ], @@ -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' ], }], ], }], @@ -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' ], }], ], }], |