Skip to content

Commit b0b69ea

Browse files
jturcottebbandix
authored andcommitted
<v8> Prevent V8 from overridding the RuntimeLibrary cflags
Since we're never going to statically link to the runtime library on Windows (unlink Chromium when built as a monolitic chrome.exe), make sure that our /M flag setting is also properly set for V8. Reviewed-by: Michael Bruning <[email protected]> Change-Id: I755c3c0bfa27e45b897a2d4d5496103913d1c6c4 Reviewed-by: Zeno Albisser <[email protected]>
1 parent b56f41f commit b0b69ea

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

chromium/v8/build/toolchain.gypi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
['v8_optimized_debug==0', {
445445
'Optimization': '0',
446446
'conditions': [
447-
['component=="shared_library"', {
447+
['component=="shared_library" or use_qt==1', {
448448
'RuntimeLibrary': '3', # /MDd
449449
}, {
450450
'RuntimeLibrary': '1', # /MTd
@@ -459,7 +459,7 @@
459459
'StringPooling': 'true',
460460
'BasicRuntimeChecks': '0',
461461
'conditions': [
462-
['component=="shared_library"', {
462+
['component=="shared_library" or use_qt==1', {
463463
'RuntimeLibrary': '3', # /MDd
464464
}, {
465465
'RuntimeLibrary': '1', # /MTd
@@ -474,7 +474,7 @@
474474
'StringPooling': 'true',
475475
'BasicRuntimeChecks': '0',
476476
'conditions': [
477-
['component=="shared_library"', {
477+
['component=="shared_library" or use_qt==1', {
478478
'RuntimeLibrary': '3', #/MDd
479479
}, {
480480
'RuntimeLibrary': '1', #/MTd
@@ -666,7 +666,7 @@
666666
'FavorSizeOrSpeed': '0',
667667
'StringPooling': 'true',
668668
'conditions': [
669-
['component=="shared_library"', {
669+
['component=="shared_library" or use_qt==1', {
670670
'RuntimeLibrary': '2', #/MD
671671
}, {
672672
'RuntimeLibrary': '0', #/MT

0 commit comments

Comments
 (0)