summaryrefslogtreecommitdiff
path: root/rust/library.go
diff options
context:
space:
mode:
author Ivan Lozano <ivanlozano@google.com> 2020-06-19 12:32:30 -0400
committer Ivan Lozano <ivanlozano@google.com> 2020-06-19 13:54:26 -0400
commit7e741cca301006b5e5801e14a180a8b346b2aa83 (patch)
treeea77805d5b47624b8510089606c3ded1dbbdd743 /rust/library.go
parent2752d926a9aa78f68c0713af6ecda11b5b02b583 (diff)
[Rust] cdylibs can now link against dylibs.
Bug: 144861059 Test: cd external/rust/crates; mma Test: Manual verification through ldd that libstd is a dependency Change-Id: I603cf519215317aa8c400cd0f6ebb1b58f5bcf15
Diffstat (limited to 'rust/library.go')
-rw-r--r--rust/library.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/rust/library.go b/rust/library.go
index 2e5126639..ba5546cdd 100644
--- a/rust/library.go
+++ b/rust/library.go
@@ -311,8 +311,8 @@ func (library *libraryDecorator) compilerProps() []interface{} {
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()) {
+ // TODO(b/155498724) Remove if C static libraries no longer require libstd as an rlib dependency.
+ if !ctx.Host() && library.static() {
library.setNoStdlibs()
for _, stdlib := range config.Stdlibs {
deps.Rlibs = append(deps.Rlibs, stdlib+".static")