diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-15 14:22:52 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-15 14:32:15 +0200 |
| commit | 743a6413f3cc0a621865a81f06c6d7bed7b662c5 (patch) | |
| tree | d4e3b5ad91b81c9259001410ad3deb0eb2dced3b | |
| parent | a674cb3f8da072db2795806ec2df63a451430a49 (diff) | |
| download | qtwebengine-chromium-743a6413f3cc0a621865a81f06c6d7bed7b662c5.tar.gz | |
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>
| -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 |