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. Change-Id: Ia17073f6811f43aa264d08c270b1ab841a09408f Reviewed-by: Michael Bruning <michael.bruning@digia.com>
qt · Apr 15, 2014 · 743a641 · 743a641
1 parent a674cb3
commit 743a641
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/chromium/v8/build/toolchain.gypi b/chromium/v8/build/toolchain.gypi
@@ -444,7 +444,7 @@
               ['v8_optimized_debug==0', {
                 'Optimization': '0',
                 'conditions': [
-                  ['component=="shared_library"', {
+                  ['component=="shared_library" or use_qt==1', {
                     'RuntimeLibrary': '3',  # /MDd
                   }, {
                     'RuntimeLibrary': '1',  # /MTd
@@ -459,7 +459,7 @@
                 'StringPooling': 'true',
                 'BasicRuntimeChecks': '0',
                 'conditions': [
-                  ['component=="shared_library"', {
+                  ['component=="shared_library" or use_qt==1', {
                     'RuntimeLibrary': '3',  # /MDd
                   }, {
                     'RuntimeLibrary': '1',  # /MTd
@@ -474,7 +474,7 @@
                 'StringPooling': 'true',
                 'BasicRuntimeChecks': '0',
                 'conditions': [
-                  ['component=="shared_library"', {
+                  ['component=="shared_library" or use_qt==1', {
                     'RuntimeLibrary': '3',  #/MDd
                   }, {
                     'RuntimeLibrary': '1',  #/MTd
@@ -666,7 +666,7 @@
                 'FavorSizeOrSpeed': '0',
                 'StringPooling': 'true',
                 'conditions': [
-                  ['component=="shared_library"', {
+                  ['component=="shared_library" or use_qt==1', {
                     'RuntimeLibrary': '2',  #/MD
                   }, {
                     'RuntimeLibrary': '0',  #/MT