diff options
| author |  mtklein <mtklein@chromium.org> | 2016-02-12 12:58:09 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-12 12:58:10 -0800 |
| commit | c089ba5d69926986ec0c39222c4fe3081ab7c553 (patch) | |
| tree | 596d62afad2a08b54529280a7bd3c67f28f59fe5 | |
| parent | c34940ec16868ddd1c710bffb2cb2810dc5be197 (diff) | |
followups
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693823005
Review URL: https://codereview.chromium.org/1693823005
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | gyp/yasm.gyp | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -51,7 +51,7 @@ deps = { # Mojo SDK for Mojo RPC experiments. "third_party/externals/mojo/public" : "https://chromium.googlesource.com/external/github.com/domokit/mojo_sdk@172be18ea745ab29aea132e6cb952e726dc32543", - + # xSAN bots build Clang from scratch. "third_party/externals/llvm": "https://llvm.googlesource.com/llvm@release_38", "third_party/externals/llvm/tools/clang": "https://llvm.googlesource.com/clang@release_38", "third_party/externals/llvm/projects/compiler-rt": "https://llvm.googlesource.com/compiler-rt@release_38", diff --git a/gyp/yasm.gyp b/gyp/yasm.gyp index 272778b8d5..04e23cff12 100644 --- a/gyp/yasm.gyp +++ b/gyp/yasm.gyp @@ -64,7 +64,11 @@ # Silence warnings in libc++ builds (C code doesn't need this flag). 'ldflags!': [ '-stdlib=libc++', '-fsanitize=<(skia_sanitizer)' ], # https://crbug.com/489901 - 'cflags!': [ '-fsanitize=bounds', '-fsanitize=<(skia_sanitizer)', '-fsanitize-memory-track-origins' ], + 'cflags!': [ + '-fsanitize=bounds', + '-fsanitize=<(skia_sanitizer)', + '-fsanitize-memory-track-origins', + ], 'libraries!': [ '-llog', ], }, 'targets': [ |