diff options
| author | 2020-09-15 04:06:37 +0000 | |
|---|---|---|
| committer | 2020-09-15 04:06:37 +0000 | |
| commit | 0c16fdf7a16e58f20853db166ef43bc9fd19007a (patch) | |
| tree | c946d33841d27a913db96050ffa8e49e646a3da8 /rust/compiler.go | |
| parent | b11236d53de45c128c745fe4927f13b2be20a5e6 (diff) | |
| parent | b5d2dd210ba784429d10fb9ef8cfc20aabf57ec9 (diff) | |
Merge "Don't disable rust modules for linux_bionic"
Diffstat (limited to 'rust/compiler.go')
| -rw-r--r-- | rust/compiler.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rust/compiler.go b/rust/compiler.go index ddf1fac3a..664578d82 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -216,8 +216,8 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { if !Bool(compiler.Properties.No_stdlibs) { for _, stdlib := range config.Stdlibs { - // If we're building for the primary host target, use the compiler's stdlibs - if ctx.Host() && ctx.TargetPrimary() { + // If we're building for the primary arch of the build host, use the compiler's stdlibs + if ctx.Target().Os == android.BuildOs && ctx.TargetPrimary() { stdlib = stdlib + "_" + ctx.toolchain().RustTriple() } |