Index: build/standalone.gypi |
diff --git a/build/standalone.gypi b/build/standalone.gypi |
index ee91e78899f0b9d726e10c978d89be49fdb98c88..78c178682c5741daa892f4ecafb29161c9535e3d 100644 |
--- a/build/standalone.gypi |
+++ b/build/standalone.gypi |
@@ -201,7 +201,7 @@ |
], |
}, |
'conditions': [ |
- ['asan==1', { |
+ ['asan==1 and OS!="mac"', { |
'target_defaults': { |
'cflags_cc+': [ |
'-fno-omit-frame-pointer', |
@@ -209,7 +209,7 @@ |
'-fsanitize=address', |
'-w', # http://crbug.com/162783 |
], |
- 'cflags_cc!': [ |
+ 'cflags!': [ |
'-fomit-frame-pointer', |
], |
'ldflags': [ |
@@ -217,7 +217,7 @@ |
], |
}, |
}], |
- ['tsan==1', { |
+ ['tsan==1 and OS!="mac"', { |
'target_defaults': { |
'cflags+': [ |
'-fno-omit-frame-pointer', |
@@ -238,6 +238,29 @@ |
], |
}, |
}], |
+ ['asan==1 and OS=="mac"', { |
+ 'target_defaults': { |
+ 'xcode_settings': { |
+ 'OTHER_CFLAGS+': [ |
+ '-fno-omit-frame-pointer', |
+ '-gline-tables-only', |
+ '-fsanitize=address', |
+ '-w', # http://crbug.com/162783 |
+ ], |
+ 'OTHER_CFLAGS!': [ |
+ '-fomit-frame-pointer', |
+ ], |
+ }, |
+ 'target_conditions': [ |
+ ['_type!="static_library"', { |
+ 'xcode_settings': {'OTHER_LDFLAGS': ['-fsanitize=address']}, |
+ }], |
+ ], |
+ 'dependencies': [ |
+ '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
+ ], |
+ }, |
+ }], |
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
or OS=="netbsd"', { |
'target_defaults': { |