Commit d3f74e4e authored by hans@chromium.org's avatar hans@chromium.org

Disable exceptions on Windows also in the shared_library build

They were previously only disabled in static_library builds. This is believed
to have been due to problems with old MSVC versions, but it should work now.

This change is relevant for Clang, which currently doesn't support exceptions
on Windows.

Last time I attempted to do this, it broke some tests due to a debug assertion.
Gtest had previously been catching the exception, but with exceptions disabled
it crashed. Those tests were actually broken in static_library Debug builds
too, but we don't seem to have bots for that. After Blink r176189, we no longer
hit that debug assertion, so the tests now pass.

BUG=82385
TEST=blink_platform_unittests --gtest_filter=DateTimeFormatTest.CommonPattern,
     content_browsertests --gtest_filter=RenderViewImplTest.SetEditableSelectionAndComposition
     webkit_unit_tests

R=thakis@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284519 0039d316-1c4b-4281-b951-d872f2087c98
parent a4b6352b
...@@ -5138,6 +5138,8 @@ ...@@ -5138,6 +5138,8 @@
'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"', {
...@@ -5205,11 +5207,6 @@ ...@@ -5205,11 +5207,6 @@
], ],
}, },
], ],
['component=="static_library"', {
'defines': [
'_HAS_EXCEPTIONS=0',
],
}],
['secure_atl', { ['secure_atl', {
'defines': [ 'defines': [
'_SECURE_ATL', '_SECURE_ATL',
...@@ -5292,13 +5289,8 @@ ...@@ -5292,13 +5289,8 @@
'WarningLevel': '4', 'WarningLevel': '4',
'WarnAsError': 'true', 'WarnAsError': 'true',
'DebugInformationFormat': '3', 'DebugInformationFormat': '3',
'conditions': [ # ExceptionHandling must match _HAS_EXCEPTIONS above.
['component=="shared_library"', { 'ExceptionHandling': '0',
'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