Index: trunk/src/build/common.gypi |
=================================================================== |
--- trunk/src/build/common.gypi (revision 285613) |
+++ trunk/src/build/common.gypi (working copy) |
@@ -5116,8 +5116,6 @@ |
'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', |
'WIN32_LEAN_AND_MEAN', |
'_ATL_NO_OPENGL', |
- # _HAS_EXCEPTIONS must match ExceptionHandling in msvs_settings. |
- '_HAS_EXCEPTIONS=0', |
], |
'conditions': [ |
['buildtype=="Official"', { |
@@ -5185,6 +5183,11 @@ |
], |
}, |
], |
+ ['component=="static_library"', { |
+ 'defines': [ |
+ '_HAS_EXCEPTIONS=0', |
+ ], |
+ }], |
['secure_atl', { |
'defines': [ |
'_SECURE_ATL', |
@@ -5267,8 +5270,13 @@ |
'WarningLevel': '4', |
'WarnAsError': 'true', |
'DebugInformationFormat': '3', |
- # ExceptionHandling must match _HAS_EXCEPTIONS above. |
- 'ExceptionHandling': '0', |
+ 'conditions': [ |
+ ['component=="shared_library"', { |
+ 'ExceptionHandling': '1', # /EHsc |
+ }, { |
+ 'ExceptionHandling': '0', |
+ }], |
+ ], |
}, |
'VCLibrarianTool': { |
'AdditionalOptions': ['/ignore:4221'], |