tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Migrate to the new clang lib dir

Browse source 
Test: presubmit
Change-Id: I7ac7eb415a5f5c3d8b6d9298c1b4ccf2839aaea6
This commit is contained in:
Yi Kong 2023-02-08 19:51:59 +09:00
parent 3ec4e2494b
commit bd1888156a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cc/config/global.go
View file

@ -434,7 +434,7 @@ func init() {
pctx.StaticVariable("ClangBin", "${ClangPath}/bin") pctx.StaticVariable("ClangBin", "${ClangPath}/bin")
pctx.StaticVariableWithEnvOverride("ClangShortVersion", "LLVM_RELEASE_VERSION", ClangDefaultShortVersion) 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 // 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. // being used for the rest of the build process.

2
rust/bindgen.go
View file

@ -52,7 +52,7 @@ var (
if ctx.Config().UseHostMusl() { if ctx.Config().UseHostMusl() {
return "musl/lib/" return "musl/lib/"
} else { } else {
return "lib64/" return "lib/"
} }
}) })
_ = pctx.SourcePathVariable("bindgenClang", _ = pctx.SourcePathVariable("bindgenClang",