Skip to content

Commit 12c055a

Browse files
lemiretargos
authored andcommitted
fix: lib paths and remove unneeded masm
1 parent b452308 commit 12c055a

File tree

3 files changed

+5
-24
lines changed

3 files changed

+5
-24
lines changed

node.gyp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,8 @@
581581
'msvs_settings': {
582582
'VCLinkerTool': {
583583
'AdditionalOptions': [
584-
'/WHOLEARCHIVE:<(node_lib_target_name)<(STATIC_LIB_SUFFIX)',
585-
'/WHOLEARCHIVE:<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)',
584+
'/WHOLEARCHIVE:<(PRODUCT_DIR)/lib/<(node_lib_target_name)<(STATIC_LIB_SUFFIX)',
585+
'/WHOLEARCHIVE:<(PRODUCT_DIR)/lib/<(STATIC_LIB_PREFIX)v8_base_without_compiler<(STATIC_LIB_SUFFIX)',
586586
],
587587
},
588588
},

node.gypi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
'msvs_settings': {
156156
'VCLinkerTool': {
157157
'AdditionalOptions': [
158-
'/WHOLEARCHIVE:zlib<(STATIC_LIB_SUFFIX)',
158+
'/WHOLEARCHIVE:<(PRODUCT_DIR)/lib/zlib<(STATIC_LIB_SUFFIX)',
159159
],
160160
},
161161
},
@@ -194,7 +194,7 @@
194194
'msvs_settings': {
195195
'VCLinkerTool': {
196196
'AdditionalOptions': [
197-
'/WHOLEARCHIVE:libuv<(STATIC_LIB_SUFFIX)',
197+
'/WHOLEARCHIVE:<(PRODUCT_DIR)/lib/libuv<(STATIC_LIB_SUFFIX)',
198198
],
199199
},
200200
},
@@ -373,7 +373,7 @@
373373
'msvs_settings': {
374374
'VCLinkerTool': {
375375
'AdditionalOptions': [
376-
'/WHOLEARCHIVE:<(openssl_product)',
376+
'/WHOLEARCHIVE:<(PRODUCT_DIR)/lib/<(openssl_product)',
377377
],
378378
},
379379
},

tools/v8_gypfiles/v8.gyp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,25 +1805,6 @@
18051805
}],
18061806
]
18071807
}],
1808-
['OS=="win"', {
1809-
'conditions': [
1810-
['_toolset == "host" and host_arch == "x64" or _toolset == "target" and target_arch=="x64"', {
1811-
'sources': [
1812-
'<(V8_ROOT)/src/heap/base/asm/x64/push_registers_masm.asm',
1813-
],
1814-
}],
1815-
['_toolset == "host" and host_arch == "ia32" or _toolset == "target" and target_arch=="ia32"', {
1816-
'sources': [
1817-
'<(V8_ROOT)/src/heap/base/asm/ia32/push_registers_masm.asm',
1818-
],
1819-
}],
1820-
['_toolset == "host" and host_arch == "arm64" or _toolset == "target" and target_arch=="arm64"', {
1821-
'sources': [
1822-
'<(V8_ROOT)/src/heap/base/asm/arm64/push_registers_masm.S',
1823-
],
1824-
}],
1825-
],
1826-
}],
18271808
],
18281809
},
18291810
}, # v8_heap_base

0 commit comments

Comments
 (0)