diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2017-04-13 08:00:16 -0400 |
|---|---|---|
| committer | Kevin Lubick <kjlubick@google.com> | 2017-04-13 13:01:42 +0000 |
| commit | ea0f845bf6525b41898899b3f33f3cc960443881 (patch) | |
| tree | 617d642fcaa0d69ab7d3b48155095ee1b695c01e /infra/bots/recipe_modules/flavor | |
| parent | 96d5b9a273a5513fb3215fc06452cda82c3d6872 (diff) | |
Update clang_linux to version 4
Bug: skia:
Change-Id: Iab4fcd7b8f17fa7bf478e879a325759e0c622b1a
Reviewed-on: https://skia-review.googlesource.com/13120
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 9eb4ae2fa4..8f072106fa 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -44,7 +44,8 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): if compiler == 'Clang' and os == 'Ubuntu': cc = clang_linux + '/bin/clang' cxx = clang_linux + '/bin/clang++' - extra_ldflags.append('-fuse-ld=lld') + if 'MSAN' not in extra_config: + extra_ldflags.append('-fuse-ld=lld') elif compiler == 'Clang': cc, cxx = 'clang', 'clang++' elif compiler == 'GCC': |