Switch libcompiler_rt-extras to LateStaticLibs.
Bug: http://b/28149048 Test: Rebuild world (and check on new clang dependencies). The latest clang inserts even more dependencies for libcompiler_rt-extras (in the form of __unorddf2/__unordtf2), so we need to ensure that it gets linked after libm.a for binaries that statically pull it in. Change-Id: I22a1deb63a7ed05f77af6f91f0f7a21dcf156608
This commit is contained in:
2
cc/cc.go
2
cc/cc.go
@@ -1337,7 +1337,7 @@ func (linker *baseLinker) deps(ctx BaseModuleContext, deps Deps) Deps {
|
||||
deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...)
|
||||
|
||||
if !ctx.sdk() && ctx.ModuleName() != "libcompiler_rt-extras" {
|
||||
deps.StaticLibs = append(deps.StaticLibs, "libcompiler_rt-extras")
|
||||
deps.LateStaticLibs = append(deps.LateStaticLibs, "libcompiler_rt-extras")
|
||||
}
|
||||
|
||||
if ctx.Device() {
|
||||
|
Reference in New Issue
Block a user