Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index fbbc6169b45908863158614ea331c4d90e8bd520..73dec1d1ae6da5c7825341edd8d8db804808357f 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -4383,8 +4383,9 @@ |
], |
}], |
# Common options for AddressSanitizer, LeakSanitizer, |
- # ThreadSanitizer and MemorySanitizer. |
- ['asan==1 or lsan==1 or tsan==1 or msan==1 or ubsan==1 or ubsan_vptr==1', { |
+ # ThreadSanitizer, MemorySanitizer and non-official CFI builds. |
+ ['asan==1 or lsan==1 or tsan==1 or msan==1 or ubsan==1 or ubsan_vptr==1 or ' |
+ '(cfi_vptr==1 and buildtype!="Official")', { |
Nico
2015/08/11 22:44:40
Why is this keyed off buildtype==Official while al
pcc1
2015/08/11 22:55:10
We only emit stack traces in release mode when cfi
|
'target_conditions': [ |
['_toolset=="target"', { |
'cflags': [ |