Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index c9d34fafb4cc84415a8edf4603fb3fd4d4164d13..4a9989e3b8fc65e422ac976fafd2e771576df97a 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -5144,6 +5144,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"', { |
@@ -5211,11 +5213,6 @@ |
], |
}, |
], |
- ['component=="static_library"', { |
- 'defines': [ |
- '_HAS_EXCEPTIONS=0', |
- ], |
- }], |
['secure_atl', { |
'defines': [ |
'_SECURE_ATL', |
@@ -5298,13 +5295,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'], |