aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2018-01-25 15:00:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-25 15:00:05 +0000
commit828484cc9593432f38f661cfe38f06e07c75190f (patch)
tree14ce0934cf9fb29f9a08539c181f6735e94d3c51
parente3e265939f750a4f059e4d4b3addb46294038a4c (diff)
parentaf0d71c83b27f5a30e3b768d2d74f3dd9d20a343 (diff)
downloadbuild_soong-828484cc9593432f38f661cfe38f06e07c75190f.tar.gz
build_soong-828484cc9593432f38f661cfe38f06e07c75190f.tar.bz2
build_soong-828484cc9593432f38f661cfe38f06e07c75190f.zip
Prebuilt sanitizer libraries should always come from linux-x86. am: 755fe07256 am: 11a27f61e3
am: af0d71c83b Change-Id: I462fc0542755c59b542c921dee3194dc8b048045
-rw-r--r--cc/config/global.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/config/global.go b/cc/config/global.go
index eadb65d2..0934efad 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 {