From fba2aa255cd2f2bf33fa29fc937a0c29e11bb7ea Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Thu, 11 Nov 2021 09:29:07 -0500 Subject: rust: Support new rust_stdlib_prebuilt_host type Refactor Rust prebuilts to support the new rust_stdlib_prebuilt_host module type, and change the format for depending on the prebuilt host stdlibs. Bug: 140642453 Test: m Change-Id: Ifbc4741818777934e917631c788b20911856c44a --- rust/compiler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rust/compiler.go') diff --git a/rust/compiler.go b/rust/compiler.go index 293b17b50..3040e5d9e 100644 --- a/rust/compiler.go +++ b/rust/compiler.go @@ -363,9 +363,9 @@ 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 we're building for the build host, use the prebuilt stdlibs if ctx.Target().Os == ctx.Config().BuildOS { - stdlib = stdlib + "_" + ctx.toolchain().RustTriple() + stdlib = "prebuilt_" + stdlib } deps.Stdlibs = append(deps.Stdlibs, stdlib) } -- cgit v1.2.3-59-g8ed1b