Skip to content

Commit 406d774

Browse files
committed
WIP: Use force_dynamic_crt v8 flag
1 parent db00e24 commit 406d774

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

common.gypi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
'python%': 'python',
1313

1414
'node_shared%': 'false',
15+
'force_dynamic_crt%': 0,
1516
'node_use_v8_platform%': 'true',
1617
'node_use_bundled_v8%': 'true',
1718
'node_module_version%': '',

configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -889,6 +889,7 @@ def configure_v8(o):
889889
o['variables']['v8_use_snapshot'] = 'false' if options.without_snapshot else 'true'
890890
o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform)
891891
o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8)
892+
o['variables']['force_dynamic_crt'] = int(options.shared)
892893
o['variables']['node_enable_d8'] = b(options.enable_d8)
893894
if options.enable_d8:
894895
o['variables']['test_isolation_mode'] = 'noop' # Needed by d8.gyp.

deps/v8/build/toolchain.gypi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
'ubsan_vptr%': 0,
4040
'v8_target_arch%': '<(target_arch)',
4141
'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
42+
'force_dynamic_crt%': 0,
4243
# Native Client builds currently use the V8 ARM JIT and
4344
# arm/simulator-arm.cc to defer the significant effort required
4445
# for NaCl JIT support. The nacl_target_arch variable provides
@@ -1104,7 +1105,7 @@
11041105
'VCCLCompilerTool': {
11051106
'Optimization': '0',
11061107
'conditions': [
1107-
['component=="shared_library" or node_shared=="true"', {
1108+
['component=="shared_library" or force_dynamic_crt==1', {
11081109
'RuntimeLibrary': '3', # /MDd
11091110
}, {
11101111
'RuntimeLibrary': '1', # /MTd
@@ -1156,7 +1157,7 @@
11561157
'StringPooling': 'true',
11571158
'BasicRuntimeChecks': '0',
11581159
'conditions': [
1159-
['component=="shared_library" or node_shared=="true"', {
1160+
['component=="shared_library" or force_dynamic_crt==1', {
11601161
'RuntimeLibrary': '3', #/MDd
11611162
}, {
11621163
'RuntimeLibrary': '1', #/MTd
@@ -1347,7 +1348,7 @@
13471348
'FavorSizeOrSpeed': '0',
13481349
'StringPooling': 'true',
13491350
'conditions': [
1350-
['component=="shared_library" or node_shared=="true"', {
1351+
['component=="shared_library" or force_dynamic_crt==1', {
13511352
'RuntimeLibrary': '2', #/MD
13521353
}, {
13531354
'RuntimeLibrary': '0', #/MT

node.gyp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
'node_use_v8_platform%': 'true',
1010
'node_use_bundled_v8%': 'true',
1111
'node_shared%': 'false',
12+
'force_dynamic_crt%': 0,
1213
'node_module_version%': '',
1314
'node_shared_zlib%': 'false',
1415
'node_shared_http_parser%': 'false',

0 commit comments

Comments
 (0)