summaryrefslogtreecommitdiff
path: root/rust/compiler.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2021-07-20 09:47:41 -0700
committer Colin Cross <ccross@android.com> 2021-07-20 12:46:48 -0700
commit0c66bc615b399d2201b15b4c9052066db04a3f5e (patch)
treebe8334e4662f4bf137d2231dc92755e44fc85d5e /rust/compiler.go
parentae86338676084cf5966adf99f34e7086f9687edc (diff)
Replace android.BuildOs with Config.BuildOS
Replace the android.BuildOs constant with Config.BuildOS so that it can vary based on the product config. Bug: 190084016 Test: all Soong tests Change-Id: Ia67f872d8b2ab788747a22e3a9659dc21c9775cd
Diffstat (limited to 'rust/compiler.go')
-rw-r--r--rust/compiler.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/compiler.go b/rust/compiler.go
index 0b28135ae..df77759d6 100644
--- a/rust/compiler.go
+++ b/rust/compiler.go
@@ -305,7 +305,7 @@ 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 arch of the build host, use the compiler's stdlibs
- if ctx.Target().Os == android.BuildOs {
+ if ctx.Target().Os == ctx.Config().BuildOS {
stdlib = stdlib + "_" + ctx.toolchain().RustTriple()
}
deps.Stdlibs = append(deps.Stdlibs, stdlib)