From 755fe072568ec18d563b7e54bc5e2a5bd90d3854 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 24 Jan 2018 19:58:36 -0800 Subject: [PATCH] Prebuilt sanitizer libraries should always come from linux-x86. Bug: http://b/68397894 Test: Build on darwin with new toolchain. Change-Id: I4d81efdc84d0b6f07482206430252ea63a4b081b --- cc/config/global.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/config/global.go b/cc/config/global.go index 5e99cdebd..37848247b 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -201,7 +201,7 @@ func init() { } return ClangDefaultShortVersion, nil }) - pctx.StaticVariable("ClangAsanLibDir", "${ClangPath}/lib64/clang/${ClangShortVersion}/lib/linux") + pctx.StaticVariable("ClangAsanLibDir", "${ClangBase}/linux-x86/${ClangVersion}/lib64/clang/${ClangShortVersion}/lib/linux") if runtime.GOOS == "darwin" { pctx.StaticVariable("LLVMGoldPlugin", "${ClangPath}/lib64/LLVMgold.dylib") } else {