diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 21:04:56 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 21:04:56 +0000 |
| commit | 48688df02dc1ab42e71720f41e506a4998be9b76 (patch) | |
| tree | 85565d3ffaaf9aeeb7e73e30f502f5483652a411 | |
| parent | 90ec60d0ec04e65dec68bddc388fff1f8052f758 (diff) | |
| download | chromium_src-48688df02dc1ab42e71720f41e506a4998be9b76.zip chromium_src-48688df02dc1ab42e71720f41e506a4998be9b76.tar.gz chromium_src-48688df02dc1ab42e71720f41e506a4998be9b76.tar.bz2 | |
Another shot at using the new asan flag
BUG=159580, 162783
TBR=glider
Review URL: https://codereview.chromium.org/11428031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169750 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 17 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/build/common.gypi b/build/common.gypi index 9d89186..0daf444 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2700,13 +2700,12 @@ 'target_conditions': [ ['_toolset=="target"', { 'cflags': [ - '-faddress-sanitizer', + '-fsanitize=address', '-fno-omit-frame-pointer', - # See http://crbug.com/159580 - '-w', + '-w', # http://crbug.com/162783 ], 'ldflags': [ - '-faddress-sanitizer', + '-fsanitize=address', ], 'defines': [ 'ADDRESS_SANITIZER', @@ -3164,9 +3163,8 @@ # Due to issues in Clang build system, using ASan on 32-bit # binaries on x86_64 host is problematic. # TODO(eugenis): re-enable. - '-faddress-sanitizer', - # See http://crbug.com/159580 - '-w', + '-fsanitize=address', + '-w', # http://crbug.com/162783 ], 'ldflags!': [ '-faddress-sanitizer', @@ -3287,9 +3285,8 @@ ['asan==1', { 'xcode_settings': { 'OTHER_CFLAGS': [ - '-faddress-sanitizer', - # See http://crbug.com/159580 - '-w', + '-fsanitize=address', + '-w', # http://crbug.com/162783 ], }, 'defines': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 3ede45b..c700cec 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2494,10 +2494,10 @@ ], }], ['asan==1', { - 'cflags!': [ '-faddress-sanitizer' ], + 'cflags!': [ '-faddress-sanitizer', '-fsanitize=address', ], 'xcode_settings': { 'OTHER_CFLAGS!': [ - '-faddress-sanitizer', + '-faddress-sanitizer', '-fsanitize=address', ], }, }], |