Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa0833a8 authored by Yi Kong's avatar Yi Kong Committed by Gerrit Code Review
Browse files

Merge "Migrate to the new clang lib dir"

parents 41d05397 bd188815

cc/config/global.go

+1 −1
Original line number Diff line number Diff line
@@ -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.

rust/bindgen.go

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ var ( 
		if ctx.Config().UseHostMusl() {

			return "musl/lib/"

		} else {

			return "lib64/"

			return "lib/"

		}

	})

	_ = pctx.SourcePathVariable("bindgenClang",