| commit | dd29407e74d796ab4493b3e0a8ccdb5693e15acd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 20 22:46:54 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Apr 20 22:46:55 2017 +0000 |
| tree | e297ff9cbb208385f3e168b4b86c48b6195ad4bc | |
| parent | 8f4fdd8f7636d4ee51afec7273f7734b0a32b25a [diff] | |
| parent | 57a523863d40710463db44ea40bf4802dd08e978 [diff] |
Merge "Don't write output during tests"
diff --git a/cc/sanitize.go b/cc/sanitize.go index 18d6c16..7d7bd09 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go
@@ -186,6 +186,12 @@ s.Diag.Cfi = nil } + // Also disable CFI if ASAN is enabled. + if Bool(s.Address) { + s.Cfi = nil + s.Diag.Cfi = nil + } + if ctx.staticBinary() { s.Address = nil s.Coverage = nil