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
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
Reference in New Issue
Block a user