diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-15 14:22:52 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:21:17 +0200 |
| commit | b0b69eacfc171f2ef7f012f4be372c0713211d08 (patch) | |
| tree | b34e3d38980d0ee1927d24fbb0b1b5faffc2e0ca | |
| parent | b56f41fca47b4276ce56495469657128958d2f55 (diff) | |
| download | qtwebengine-chromium-b0b69eacfc171f2ef7f012f4be372c0713211d08.tar.gz | |
<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 <michael.bruning@digia.com>
Change-Id: I755c3c0bfa27e45b897a2d4d5496103913d1c6c4
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | chromium/v8/build/toolchain.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/v8/build/toolchain.gypi b/chromium/v8/build/toolchain.gypi index 99f357a965a..2dc3c04e1f1 100644 --- 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 |