Merge "disable rtti by default even for non-bionic builds" into main
This commit is contained in:
@@ -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}")
|
||||||
|
Reference in New Issue
Block a user