Revert of Disable exceptions on Windows also in the shared_library build (https://codereview.chromium.org/404853002/)
Reason for revert: Speculative revert to try to fix chrome_elf_unittests on Win7 x64. http://build.chromium.org/p/chromium.win/builders/Win%207%20Tests%20x64%20%282%29/builds/18370 AddDllsFromRegistryToBlacklist LoadBlacklistedLibrary I'll reland if that's not it. Original issue's description: > 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 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=284519 TBR=maruel@chromium.org,thakis@chromium.org,hans@chromium.org NOTREECHECKS=true NOTRY=true BUG=82385 Review URL: https://codereview.chromium.org/410613002 git-svn-id: http://src.chromium.org/svn/trunk/src/build@284626 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
583d9e8bd5
Коммит
f2ec1c42aa
16
common.gypi
16
common.gypi
|
@ -5138,8 +5138,6 @@
|
|||
'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,6 +5205,11 @@
|
|||
],
|
||||
},
|
||||
],
|
||||
['component=="static_library"', {
|
||||
'defines': [
|
||||
'_HAS_EXCEPTIONS=0',
|
||||
],
|
||||
}],
|
||||
['secure_atl', {
|
||||
'defines': [
|
||||
'_SECURE_ATL',
|
||||
|
@ -5289,8 +5292,13 @@
|
|||
'WarningLevel': '4',
|
||||
'WarnAsError': 'true',
|
||||
'DebugInformationFormat': '3',
|
||||
# ExceptionHandling must match _HAS_EXCEPTIONS above.
|
||||
'ExceptionHandling': '0',
|
||||
'conditions': [
|
||||
['component=="shared_library"', {
|
||||
'ExceptionHandling': '1', # /EHsc
|
||||
}, {
|
||||
'ExceptionHandling': '0',
|
||||
}],
|
||||
],
|
||||
},
|
||||
'VCLibrarianTool': {
|
||||
'AdditionalOptions': ['/ignore:4221'],
|
||||
|
|
Загрузка…
Ссылка в новой задаче