openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Change stdlib linkage for C libraries."

This commit is contained in:
Ivan Lozano 2019-11-22 01:49:07 +00:00 committed by Gerrit Code Review
parent 3bc70db398 88f2b1ce53
commit bdebb171cc
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rust/library.go
View File

@ -19,6 +19,7 @@ import (
"strings" "strings"
"android/soong/android" "android/soong/android"
"android/soong/rust/config"
) )
func init() { func init() {
@ -304,6 +305,15 @@ func (library *libraryDecorator) compilerProps() []interface{} {
} }
func (library *libraryDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps { func (library *libraryDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps {
// TODO(b/144861059) Remove if C libraries support dylib linkage in the future.
if !ctx.Host() && (library.static() || library.shared()) {
library.setNoStdlibs()
for _, stdlib := range config.Stdlibs {
deps.Rlibs = append(deps.Rlibs, stdlib+".static")
}
}
deps = library.baseCompiler.compilerDeps(ctx, deps) deps = library.baseCompiler.compilerDeps(ctx, deps)
if ctx.toolchain().Bionic() && (library.dylib() || library.shared()) { if ctx.toolchain().Bionic() && (library.dylib() || library.shared()) {