Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index db01f93e0664e2469b03eff81e6dc1c8e1a7b1c4..e0136f041e3538d95d53b15c2edfff02335e902d 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -5140,6 +5140,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"', { |
@@ -5207,11 +5209,6 @@ |
], |
}, |
], |
- ['component=="static_library"', { |
- 'defines': [ |
- '_HAS_EXCEPTIONS=0', |
- ], |
- }], |
['secure_atl', { |
'defines': [ |
'_SECURE_ATL', |
@@ -5294,13 +5291,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'], |