diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-21 22:35:48 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-21 22:35:48 +0000 |
| commit | d3f74e4e00df73f727a09adb63b19d8be165d8d2 (patch) | |
| tree | a25020083408f2a68cfadf1d3a3e37aec6ac5521 /build | |
| parent | a4b6352b060f2830d952585d2f84097d9143f154 (diff) | |
| download | chromium_src-d3f74e4e00df73f727a09adb63b19d8be165d8d2.zip chromium_src-d3f74e4e00df73f727a09adb63b19d8be165d8d2.tar.gz chromium_src-d3f74e4e00df73f727a09adb63b19d8be165d8d2.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/build/common.gypi b/build/common.gypi index 533ea80..99b4cb8 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5138,6 +5138,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"', { @@ -5205,11 +5207,6 @@ ], }, ], - ['component=="static_library"', { - 'defines': [ - '_HAS_EXCEPTIONS=0', - ], - }], ['secure_atl', { 'defines': [ '_SECURE_ATL', @@ -5292,13 +5289,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'], |