Index: build/standalone.gypi |
diff --git a/build/standalone.gypi b/build/standalone.gypi |
index ee91e78899f0b9d726e10c978d89be49fdb98c88..20efa3aa885420d7d4c1fd8d692de90ac3d59eee 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,15 +209,12 @@ |
'-fsanitize=address', |
'-w', # http://crbug.com/162783 |
], |
- 'cflags_cc!': [ |
- '-fomit-frame-pointer', |
- ], |
Michael Achenbach
2015/01/09 12:42:48
Why remove this? It's still in common.gypi:
https:
jochen (gone - plz use gerrit)
2015/01/09 12:46:43
uh, that's a mistake
|
'ldflags': [ |
'-fsanitize=address', |
], |
}, |
}], |
- ['tsan==1', { |
+ ['tsan==1 and OS!="mac"', { |
'target_defaults': { |
'cflags+': [ |
'-fno-omit-frame-pointer', |
@@ -238,6 +235,50 @@ |
], |
}, |
}], |
+ ['asan==1 and OS=="mac"', { |
+ 'target_defaults': { |
+ 'xcode_settings': { |
+ 'OTHER_CFLAGS+': [ |
Michael Achenbach
2015/01/09 12:42:48
Why +?
Why -fno-omit-frame-pointer ?
jochen (gone - plz use gerrit)
2015/01/09 12:46:43
so it gets added to the list?
Michael Achenbach
2015/01/09 12:52:57
OK - I just made a 1:1 comparison with common.gypi
|
+ '-fno-omit-frame-pointer', |
+ '-gline-tables-only', |
+ '-fsanitize=address', |
+ '-w', # http://crbug.com/162783 |
+ ], |
+ }, |
+ 'target_conditions': [ |
+ ['_type!="static_library"', { |
+ 'xcode_settings': {'OTHER_LDFLAGS': ['-fsanitize=address']}, |
+ }], |
+ ], |
+ 'dependencies': [ |
+ '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
+ ], |
+ }, |
+ }], |
+ ['tsan==1 and OS=="mac"', { |
+ 'target_defaults': { |
+ 'xcode_settings': { |
+ 'OTHER_CFLAGS+': [ |
+ '-fno-omit-frame-pointer', |
+ '-gline-tables-only', |
+ '-fsanitize=thread', |
+ '-fPIC', |
+ '-Wno-c++11-extensions', |
+ ], |
+ }, |
+ 'target_conditions': [ |
+ ['_type!="static_library"', { |
+ 'xcode_settings': {'OTHER_LDFLAGS': ['-fsanitize=address', '-pie']}, |
+ }], |
+ ], |
+ 'dependencies': [ |
+ '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
Michael Achenbach
2015/01/09 12:42:48
I don't find the same for tsan in commmon.gypi
jochen (gone - plz use gerrit)
2015/01/09 12:46:43
removed
Michael Achenbach
2015/01/09 12:52:57
Actually, I don't see any tsan related things for
|
+ ], |
+ 'defines': [ |
+ 'THREAD_SANITIZER', |
+ ], |
+ }, |
+ }], |
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
or OS=="netbsd"', { |
'target_defaults': { |