Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index db01f93e0664e2469b03eff81e6dc1c8e1a7b1c4..064abb450f70a92100dfed15b5de068762ee5acd 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -5140,6 +5140,7 @@ |
| 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', |
| 'WIN32_LEAN_AND_MEAN', |
| '_ATL_NO_OPENGL', |
| + '_HAS_EXCEPTIONS=0', |
|
Nico
2014/07/18 21:17:17
Maybe add a note here that this must match the Exc
hans
2014/07/18 22:41:52
Done.
|
| ], |
| 'conditions': [ |
| ['buildtype=="Official"', { |
| @@ -5207,11 +5208,6 @@ |
| ], |
| }, |
| ], |
| - ['component=="static_library"', { |
| - 'defines': [ |
| - '_HAS_EXCEPTIONS=0', |
| - ], |
| - }], |
| ['secure_atl', { |
| 'defines': [ |
| '_SECURE_ATL', |
| @@ -5294,13 +5290,7 @@ |
| 'WarningLevel': '4', |
| 'WarnAsError': 'true', |
| 'DebugInformationFormat': '3', |
| - 'conditions': [ |
| - ['component=="shared_library"', { |
| - 'ExceptionHandling': '1', # /EHsc |
| - }, { |
| - 'ExceptionHandling': '0', |
| - }], |
| - ], |
| + 'ExceptionHandling': '0', |
|
Nico
2014/07/18 21:17:17
...and add a note here that this must match _HAS_E
hans
2014/07/18 22:41:52
Done.
|
| }, |
| 'VCLibrarianTool': { |
| 'AdditionalOptions': ['/ignore:4221'], |