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

Unified Diff: build/common.gypi

Issue 389313002: Avoid macro redefinition in tools_sanity_unittest.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move #endif above 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 | « base/tools_sanity_unittest.cc ('k') | 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 3b318d22a9daf18e45ab79425391e20d0057ed66..03fbb569f2511549de866710b22140a940ac7048 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3989,7 +3989,6 @@
['_toolset=="target"', {
'cflags': [
'-fsanitize=address',
- '-Wno-error=macro-redefined', # http://crbug.com/162783
],
'ldflags': [
'-fsanitize=address',
@@ -4012,7 +4011,6 @@
'-fsanitize=undefined',
# -fsanitize=vptr is incompatible with -fno-rtti.
'-fno-sanitize=vptr',
- '-Wno-error=macro-redefined', # http://crbug.com/162783
],
'ldflags': [
'-fsanitize=undefined',
@@ -4036,7 +4034,6 @@
'-fsanitize=vptr',
'-fsanitize=null', # Avoid dereferences on null pointer objects.
'-fsanitize-blacklist=<(ubsan_vptr_blacklist)',
- '-Wno-error=macro-redefined', # http://crbug.com/162783
],
'cflags_cc!': [
'-fno-rtti',
@@ -4632,8 +4629,6 @@
# binaries on x86_64 host is problematic.
# TODO(eugenis): re-enable.
'-fsanitize=address',
- '-Wno-error=macro-redefined', # http://crbug.com/162783
-
],
'ldflags!': [
'-fsanitize=address',
@@ -4803,7 +4798,6 @@
'OTHER_CFLAGS': [
'-fsanitize=address',
'-mllvm -asan-globals=0', # http://crbug.com/352073
- '-Wno-error=macro-redefined', # http://crbug.com/162783
'-Wno-error=unused-function', # http://crbug.com/162783
'-gline-tables-only',
],
« no previous file with comments | « base/tools_sanity_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698