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

Unified Diff: build/common.gypi

Issue 11411191: Revert 169589: Caused a bunch of (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
===================================================================
--- build/common.gypi (revision 169591)
+++ build/common.gypi (working copy)
@@ -2700,12 +2700,13 @@
'target_conditions': [
['_toolset=="target"', {
'cflags': [
- '-fsanitize=address',
+ '-faddress-sanitizer',
'-fno-omit-frame-pointer',
- '-w', # http://crbug.com/162783
+ # See http://crbug.com/159580
+ '-w',
],
'ldflags': [
- '-fsanitize=address',
+ '-faddress-sanitizer',
],
'defines': [
'ADDRESS_SANITIZER',
@@ -3163,8 +3164,9 @@
# Due to issues in Clang build system, using ASan on 32-bit
# binaries on x86_64 host is problematic.
# TODO(eugenis): re-enable.
- '-fsanitize=address',
- '-w', # http://crbug.com/162783
+ '-faddress-sanitizer',
+ # See http://crbug.com/159580
+ '-w',
],
'ldflags!': [
'-faddress-sanitizer',
@@ -3285,8 +3287,9 @@
['asan==1', {
'xcode_settings': {
'OTHER_CFLAGS': [
- '-fsanitize=address',
- '-w', # http://crbug.com/162783
+ '-faddress-sanitizer',
+ # See http://crbug.com/159580
+ '-w',
],
},
'defines': [
« 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