From 3eda019e040c3ebaaa8366728bbcd5a371ec9667 Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Fri, 14 Apr 2023 18:07:25 +0000 Subject: [PATCH] Revert "Respect Clang version override env vars." Revert submission 2478283-master-I3cf18e7814ff52d526017e4fe34b17ab3d8f1080 Reason for revert: implementing a different way Reverted changes: /q/submissionid:2478283-master-I3cf18e7814ff52d526017e4fe34b17ab3d8f1080 Change-Id: I1d690b6d322adc664e4c02d958f0183bbb78e669 --- android/config_bp2build.go | 9 --------- cc/config/global.go | 7 +++++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/android/config_bp2build.go b/android/config_bp2build.go index 830890d56..2beeb51ec 100644 --- a/android/config_bp2build.go +++ b/android/config_bp2build.go @@ -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) { diff --git a/cc/config/global.go b/cc/config/global.go index 0257fa352..05dc77354 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -417,12 +417,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