aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-12-08 10:04:42 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-12-08 10:04:42 -0800
commit77665b8a0721a15584eb62a7ac276149139f6ff8 (patch)
tree18f8e673f6a12f980bc390dfa351672df97102fe
parent815d571b6cea22eb2f26940ff464bf6862e29c90 (diff)
simplify the way we disable sanitizers for yasm
seems to work fine CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN-Trybot BUG=skia: Review URL: https://codereview.chromium.org/1505013003
-rw-r--r--gyp/yasm.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gyp/yasm.gyp b/gyp/yasm.gyp
index aeca9c05fb..de1d1dc1b7 100644
--- a/gyp/yasm.gyp
+++ b/gyp/yasm.gyp
@@ -62,9 +62,9 @@
},
'target_defaults': {
# Silence warnings in libc++ builds (C code doesn't need this flag).
- 'ldflags!': [ '-stdlib=libc++', '-fsanitize=address,bool,integer-divide-by-zero,null,object-size,return,nonnull-attribute,returns-nonnull-attribute,signed-integer-overflow,unreachable,vla-bound' ],
+ 'ldflags!': [ '-stdlib=libc++', '-fsanitize=<(skia_sanitizer)' ],
# https://crbug.com/489901
- 'cflags!': [ '-fsanitize=bounds', '-fsanitize=address,bool,integer-divide-by-zero,null,object-size,return,nonnull-attribute,returns-nonnull-attribute,signed-integer-overflow,unreachable,vla-bound' ],
+ 'cflags!': [ '-fsanitize=bounds', '-fsanitize=<(skia_sanitizer)' ],
'libraries!': [ '-llog', ],
},
'targets': [