From ea0f845bf6525b41898899b3f33f3cc960443881 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Thu, 13 Apr 2017 08:00:16 -0400 Subject: Update clang_linux to version 4 Bug: skia: Change-Id: Iab4fcd7b8f17fa7bf478e879a325759e0c622b1a Reviewed-on: https://skia-review.googlesource.com/13120 Commit-Queue: Mike Klein Reviewed-by: Mike Klein --- infra/bots/recipe_modules/flavor/gn_flavor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'infra/bots/recipe_modules') 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': -- cgit v1.2.3