diff --git a/cc/config/global.go b/cc/config/global.go index 2fba54347..3fd1b10e0 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -434,7 +434,7 @@ func init() { pctx.StaticVariable("ClangBin", "${ClangPath}/bin") pctx.StaticVariableWithEnvOverride("ClangShortVersion", "LLVM_RELEASE_VERSION", ClangDefaultShortVersion) - pctx.StaticVariable("ClangAsanLibDir", "${ClangBase}/linux-x86/${ClangVersion}/lib64/clang/${ClangShortVersion}/lib/linux") + pctx.StaticVariable("ClangAsanLibDir", "${ClangBase}/linux-x86/${ClangVersion}/lib/clang/${ClangShortVersion}/lib/linux") // These are tied to the version of LLVM directly in external/llvm, so they might trail the host prebuilts // being used for the rest of the build process. diff --git a/rust/bindgen.go b/rust/bindgen.go index e81ec6bf6..878f896b6 100644 --- a/rust/bindgen.go +++ b/rust/bindgen.go @@ -52,7 +52,7 @@ var ( if ctx.Config().UseHostMusl() { return "musl/lib/" } else { - return "lib64/" + return "lib/" } }) _ = pctx.SourcePathVariable("bindgenClang",