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

Commit 162fb00e authored by Sam Delmerico's avatar Sam Delmerico Committed by Gerrit Code Review
Browse files

Merge "Revert "Respect Clang version override env vars.""

parents 934d5047 3eda019e

android/config_bp2build.go

+0 −9
Original line number Diff line number Diff line
@@ -95,15 +95,6 @@ func (ev ExportedVariables) ExportVariableConfigMethod(name string, method inter 
	return ev.pctx.VariableConfigMethod(name, method)

}



func (ev ExportedVariables) ExportStringStaticVariableWithEnvOverride(name, envVar, defaultVal string) {

	ev.ExportVariableConfigMethod(name, func(config Config) string {

		if override := config.Getenv(envVar); override != "" {

			return override

		}

		return defaultVal

	})

}



// ExportSourcePathVariable declares a static "source path" variable and exports

// it to Bazel's toolchain.

func (ev ExportedVariables) ExportSourcePathVariable(name string, value string) {

cc/config/global.go

+5 −2
Original line number Diff line number Diff line
@@ -433,12 +433,15 @@ func init() { 
	exportedVars.ExportStringList("CommonGlobalIncludes", commonGlobalIncludes)

	pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I", commonGlobalIncludes)



	exportedVars.ExportStringStaticVariable("CLANG_DEFAULT_VERSION", ClangDefaultVersion)

	exportedVars.ExportStringStaticVariable("CLANG_DEFAULT_SHORT_VERSION", ClangDefaultShortVersion)



	pctx.StaticVariableWithEnvOverride("ClangBase", "LLVM_PREBUILTS_BASE", ClangDefaultBase)

	exportedVars.ExportStringStaticVariableWithEnvOverride("ClangVersion", "LLVM_PREBUILTS_VERSION", ClangDefaultVersion)

	pctx.StaticVariableWithEnvOverride("ClangVersion", "LLVM_PREBUILTS_VERSION", ClangDefaultVersion)

	pctx.StaticVariable("ClangPath", "${ClangBase}/${HostPrebuiltTag}/${ClangVersion}")

	pctx.StaticVariable("ClangBin", "${ClangPath}/bin")



	exportedVars.ExportStringStaticVariableWithEnvOverride("ClangShortVersion", "LLVM_RELEASE_VERSION", ClangDefaultShortVersion)

	pctx.StaticVariableWithEnvOverride("ClangShortVersion", "LLVM_RELEASE_VERSION", ClangDefaultShortVersion)

	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