Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index baf460acd14edea2beb50912ba84b98137fae92c..dc80c4b404cf221e7d01c32a465ed52dcd0a1b5d 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -5116,6 +5116,8 @@ |
'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"', { |
@@ -5183,11 +5185,6 @@ |
], |
}, |
], |
- ['component=="static_library"', { |
- 'defines': [ |
- '_HAS_EXCEPTIONS=0', |
- ], |
- }], |
['secure_atl', { |
'defines': [ |
'_SECURE_ATL', |
@@ -5270,13 +5267,8 @@ |
'WarningLevel': '4', |
'WarnAsError': 'true', |
'DebugInformationFormat': '3', |
- 'conditions': [ |
- ['component=="shared_library"', { |
- 'ExceptionHandling': '1', # /EHsc |
- }, { |
- 'ExceptionHandling': '0', |
- }], |
- ], |
+ # ExceptionHandling must match _HAS_EXCEPTIONS above. |
+ 'ExceptionHandling': '0', |
}, |
'VCLibrarianTool': { |
'AdditionalOptions': ['/ignore:4221'], |