Skip to content

Commit b3bc642

Browse files
refacktargos
authored andcommittedSep 12, 2018
build,win: WHOLEARCHIVE needs just lib name
* Fixes ninja build PR-URL: #22698 Reviewed-By: João Reis <reis@janeasystems.com>
1 parent d03ce9d commit b3bc642

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed
 

‎node.gyp

+1-2
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@
260260
'msvs_settings': {
261261
'VCLinkerTool': {
262262
'AdditionalOptions': [
263-
'/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\'
264-
'<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
263+
'/WHOLEARCHIVE:<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
265264
],
266265
},
267266
},

‎node.gypi

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
'msvs_settings': {
142142
'VCLinkerTool': {
143143
'AdditionalOptions': [
144-
'/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\zlib<(STATIC_LIB_SUFFIX)',
144+
'/WHOLEARCHIVE:zlib<(STATIC_LIB_SUFFIX)',
145145
],
146146
},
147147
},
@@ -179,7 +179,7 @@
179179
'msvs_settings': {
180180
'VCLinkerTool': {
181181
'AdditionalOptions': [
182-
'/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\libuv<(STATIC_LIB_SUFFIX)',
182+
'/WHOLEARCHIVE:libuv<(STATIC_LIB_SUFFIX)',
183183
],
184184
},
185185
},
@@ -313,7 +313,7 @@
313313
'msvs_settings': {
314314
'VCLinkerTool': {
315315
'AdditionalOptions': [
316-
'/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\<(openssl_product)',
316+
'/WHOLEARCHIVE:<(openssl_product)',
317317
],
318318
},
319319
},

0 commit comments

Comments
 (0)