diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-04-13 11:55:50 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-13 16:42:19 +0000 |
| commit | f71b33846a1529776f59964dd8b0b599009f7712 (patch) | |
| tree | bc53d8700d98915be785baa6a6962c3fbf829fa7 /infra/bots/recipe_modules | |
| parent | ade692003702864ff49207f268fd233e97fa6809 (diff) | |
re-disable lld on MSAN bots
When using lld, calls to clock_gettime() end up in the real libc
clock_gettime(). When using ld, calls to clock_gettime() end up in
__interceptor_clock_gettime().
Don't know why yet.
Change-Id: I41f54218eb961e07ed2ef2c37b864e9aeeb49662
Reviewed-on: https://skia-review.googlesource.com/13403
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'infra/bots/recipe_modules')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 744cc5a1ce..730000f116 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -46,7 +46,9 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): cxx = clang_linux + '/bin/clang++' extra_cflags .append('-B%s/bin' % clang_linux) extra_ldflags.append('-B%s/bin' % clang_linux) - extra_ldflags.append('-fuse-ld=lld') + if extra_config != 'MSAN': + # lld seems to be causing problems with MSAN's libc interceptors. + extra_ldflags.append('-fuse-ld=lld') elif compiler == 'Clang': cc, cxx = 'clang', 'clang++' elif compiler == 'GCC': |