Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: build/common.gypi

Issue 410613002: Revert of Disable exceptions on Windows also in the shared_library build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index e0136f041e3538d95d53b15c2edfff02335e902d..db01f93e0664e2469b03eff81e6dc1c8e1a7b1c4 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5140,8 +5140,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"', {
@@ -5209,6 +5207,11 @@
],
},
],
+ ['component=="static_library"', {
+ 'defines': [
+ '_HAS_EXCEPTIONS=0',
+ ],
+ }],
['secure_atl', {
'defines': [
'_SECURE_ATL',
@@ -5291,8 +5294,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'],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698