diff options
| author |  mtklein <mtklein@chromium.org> | 2016-02-12 12:15:23 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-12 12:15:23 -0800 |
| commit | 013475a27222c46e528c83704fa2bf43ba207571 (patch) | |
| tree | 1070fe0f48ee9a56b6fe08287f0f846a99f67621 /gyp | |
| parent | c08f196648463d44eb85e17c5815dbf8f709a42a (diff) | |
Put all XSAN bots on the same DEPS-sourced build of Clang.
This adds LLVM, Clang, and compiler-rt (*san tools) to DEPS,
then uses them from xsan_build, building them if needed.
This is similar to how the CMake bots bootstrap CMake if needed.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1693733003
Review URL: https://codereview.chromium.org/1693733003
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/yasm.gyp | 2 | ||||
| -rw-r--r-- | gyp/zlib.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gyp/yasm.gyp b/gyp/yasm.gyp index de1d1dc1b7..272778b8d5 100644 --- a/gyp/yasm.gyp +++ b/gyp/yasm.gyp @@ -64,7 +64,7 @@ # 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)' ], + 'cflags!': [ '-fsanitize=bounds', '-fsanitize=<(skia_sanitizer)', '-fsanitize-memory-track-origins' ], 'libraries!': [ '-llog', ], }, 'targets': [ diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp index 24c7a0a55f..59ca61c62e 100644 --- a/gyp/zlib.gyp +++ b/gyp/zlib.gyp @@ -19,6 +19,7 @@ }, }, { 'type': 'static_library', + 'cflags': [ '-w' ], 'sources': [ '../third_party/externals/zlib/adler32.c', '../third_party/externals/zlib/compress.c', |