diff options
| -rw-r--r-- | cc/config/global.go | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cc/config/global.go b/cc/config/global.go index 2205c9e48..d557c0b01 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -386,30 +386,17 @@ func init() { return strings.Join(deviceGlobalCflags, " ") }) - // Export the static default NoOverrideGlobalCflags and NoOverride64GlobalCflags to Bazel. + // Export the static default NoOverrideGlobalCflags to Bazel. exportedVars.ExportStringList("NoOverrideGlobalCflags", noOverrideGlobalCflags) - exportedVars.ExportStringList("NoOverride64GlobalCflags", noOverride64GlobalCflags) pctx.VariableFunc("NoOverrideGlobalCflags", func(ctx android.PackageVarContext) string { flags := noOverrideGlobalCflags if ctx.Config().IsEnvTrue("LLVM_NEXT") { flags = append(noOverrideGlobalCflags, llvmNextExtraCommonGlobalCflags...) - if ctx.Config().Android64() { - flags = append(noOverride64GlobalCflags) - } - } - return strings.Join(flags, " ") - }) - - // Export the static default NoOverride64GlobalCflags to Bazel. - exportedVars.ExportStringList("NoOverride64GlobalCflags", noOverride64GlobalCflags) - pctx.VariableFunc("NoOverride64GlobalCflags", func(ctx android.PackageVarContext) string { - flags := noOverride64GlobalCflags - if ctx.Config().IsEnvTrue("LLVM_NEXT") && ctx.Config().Android64() { - flags = append(noOverride64GlobalCflags, llvmNextExtraCommonGlobalCflags...) } return strings.Join(flags, " ") }) + exportedVars.ExportStringListStaticVariable("NoOverride64GlobalCflags", noOverride64GlobalCflags) exportedVars.ExportStringListStaticVariable("HostGlobalCflags", hostGlobalCflags) exportedVars.ExportStringListStaticVariable("NoOverrideExternalGlobalCflags", noOverrideExternalGlobalCflags) exportedVars.ExportStringListStaticVariable("CommonGlobalCppflags", commonGlobalCppflags) |