Commit 06530cd9 authored by zhaoqin@google.com's avatar zhaoqin@google.com

Revert 285458 "Disable exceptions on Windows in all builds (take 3)"

BUG=397465

> Disable exceptions on Windows in all builds (take 3)
> 
> They were previously enabled in shared_library builds for historical reasons.
> 
> This change is relevant for Clang, which currently doesn't support exceptions
> on Windows.
> 
> Previous attemps failed due to:
> - chrome_elf_unittests on x64 (crbug.com/396244)
>   Fixed in Chromium r285377.
> 
> - blink_platform_unittests:DateTimeFormatTest.CommonPattern et al.
>   Fixed in Blink r176189
> 
> BUG=82385
> TBR=thakis
> 
> Review URL: https://codereview.chromium.org/420593002

TBR=hans@chromium.org

Review URL: https://codereview.chromium.org/418393002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285614 0039d316-1c4b-4281-b951-d872f2087c98
parent 0b1c6eef
...@@ -5116,8 +5116,6 @@ ...@@ -5116,8 +5116,6 @@
'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
'WIN32_LEAN_AND_MEAN', 'WIN32_LEAN_AND_MEAN',
'_ATL_NO_OPENGL', '_ATL_NO_OPENGL',
# _HAS_EXCEPTIONS must match ExceptionHandling in msvs_settings.
'_HAS_EXCEPTIONS=0',
], ],
'conditions': [ 'conditions': [
['buildtype=="Official"', { ['buildtype=="Official"', {
...@@ -5185,6 +5183,11 @@ ...@@ -5185,6 +5183,11 @@
], ],
}, },
], ],
['component=="static_library"', {
'defines': [
'_HAS_EXCEPTIONS=0',
],
}],
['secure_atl', { ['secure_atl', {
'defines': [ 'defines': [
'_SECURE_ATL', '_SECURE_ATL',
...@@ -5267,8 +5270,13 @@ ...@@ -5267,8 +5270,13 @@
'WarningLevel': '4', 'WarningLevel': '4',
'WarnAsError': 'true', 'WarnAsError': 'true',
'DebugInformationFormat': '3', 'DebugInformationFormat': '3',
# ExceptionHandling must match _HAS_EXCEPTIONS above. 'conditions': [
'ExceptionHandling': '0', ['component=="shared_library"', {
'ExceptionHandling': '1', # /EHsc
}, {
'ExceptionHandling': '0',
}],
],
}, },
'VCLibrarianTool': { 'VCLibrarianTool': {
'AdditionalOptions': ['/ignore:4221'], 'AdditionalOptions': ['/ignore:4221'],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment