diff options
Diffstat (limited to 'cc/library.go')
| -rw-r--r-- | cc/library.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/library.go b/cc/library.go index 5b6c6236d..95f9b0a09 100644 --- a/cc/library.go +++ b/cc/library.go @@ -1174,9 +1174,9 @@ func (library *libraryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps { deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, library.StaticProperties.Static.Export_shared_lib_headers...) deps.ReexportStaticLibHeaders = append(deps.ReexportStaticLibHeaders, library.StaticProperties.Static.Export_static_lib_headers...) } else if library.shared() { - if ctx.toolchain().Bionic() && !Bool(library.baseLinker.Properties.Nocrt) { - deps.CrtBegin = []string{"crtbegin_so"} - deps.CrtEnd = []string{"crtend_so"} + if !Bool(library.baseLinker.Properties.Nocrt) { + deps.CrtBegin = append(deps.CrtBegin, ctx.toolchain().CrtBeginSharedLibrary()...) + deps.CrtEnd = append(deps.CrtEnd, ctx.toolchain().CrtEndSharedLibrary()...) } deps.WholeStaticLibs = append(deps.WholeStaticLibs, library.SharedProperties.Shared.Whole_static_libs...) deps.StaticLibs = append(deps.StaticLibs, library.SharedProperties.Shared.Static_libs...) |