Merge "Add crtbegin_so/crtend_so to Bionic Rust libraries." am: 526291abe4

Change-Id: I7df9cf20b2eb3007e3c75dd058104f8a0a1265c7
2020-04-08 12:29:34 +00:00
parent 73864e0b04 526291abe4
commit 5b0eb8b750
1 changed files with 2 additions and 0 deletions
--- a/rust/library.go
+++ b/rust/library.go
@@ -318,6 +318,8 @@ func (library *libraryDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {

 	if ctx.toolchain().Bionic() && (library.dylib() || library.shared()) {
 		deps = library.baseCompiler.bionicDeps(ctx, deps)
+		deps.CrtBegin = "crtbegin_so"
+		deps.CrtEnd = "crtend_so"
 	}

 	return deps