Merge "disable rtti by default even for non-bionic builds" into main

This commit is contained in:
Treehugger Robot
2024-06-27 22:59:08 +00:00
committed by Gerrit Code Review

View File

@@ -539,12 +539,10 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "${config.ExternalCflags}") flags.Global.CommonFlags = append(flags.Global.CommonFlags, "${config.ExternalCflags}")
} }
if tc.Bionic() { if Bool(compiler.Properties.Rtti) {
if Bool(compiler.Properties.Rtti) { flags.Local.CppFlags = append(flags.Local.CppFlags, "-frtti")
flags.Local.CppFlags = append(flags.Local.CppFlags, "-frtti") } else {
} else { flags.Local.CppFlags = append(flags.Local.CppFlags, "-fno-rtti")
flags.Local.CppFlags = append(flags.Local.CppFlags, "-fno-rtti")
}
} }
flags.Global.AsFlags = append(flags.Global.AsFlags, "${config.CommonGlobalAsflags}") flags.Global.AsFlags = append(flags.Global.AsFlags, "${config.CommonGlobalAsflags}")