Merge changes I29bf144b,Id2879453

* changes:
  Remove more clang indirection without affecting command lines
  Remove clang indirection without affecting build.ninja
This commit is contained in:
Colin Cross
2021-07-16 00:00:22 +00:00
committed by Gerrit Code Review
19 changed files with 307 additions and 436 deletions

View File

@@ -231,7 +231,7 @@ func (object *objectLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
}
func (object *objectLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
flags.Global.LdFlags = append(flags.Global.LdFlags, ctx.toolchain().ToolchainClangLdflags())
flags.Global.LdFlags = append(flags.Global.LdFlags, ctx.toolchain().ToolchainLdflags())
if lds := android.OptionalPathForModuleSrc(ctx, object.Properties.Linker_script); lds.Valid() {
flags.Local.LdFlags = append(flags.Local.LdFlags, "-Wl,-T,"+lds.String())